yetangitu/ampache
1
0
Fork 0
mirror of https://github.com/Yetangitu/ampache synced 2025-10-03 17:59:21 +02:00
Code Issues Releases Wiki Activity

Fix channel htaccess installation

Browse source
This commit is contained in:
Afterster 2015-04-05 21:00:38 +02:00
parent b04208b5c3
commit a6d68fef55
7 changed files with 70 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

2
channel/.htaccess → channel/.htaccess.dist
View file

@ -2,5 +2,5 @@
RewriteEngine On
RewriteCond %{REQUEST_FILENAME} !-d
RewriteCond %{REQUEST_FILENAME} !-s
RewriteRule ^([0-9]+)/(.*)$ index.php?channel=$1&target=$2 [PT,L,QSA]
RewriteRule ^([0-9]+)/(.*)$ /channel/index.php?channel=$1&target=$2 [PT,L,QSA]
</IfModule>

6
install.php
View file

@ -37,6 +37,7 @@ define('INSTALL', 1);
$htaccess_play_file = AmpConfig::get('prefix') . '/play/.htaccess';
$htaccess_rest_file = AmpConfig::get('prefix') . '/rest/.htaccess';
$htaccess_channel_file = AmpConfig::get('prefix') . '/channel/.htaccess';
// Clean up incoming variables
$web_path = scrub_in($_REQUEST['web_path']);
@ -142,12 +143,17 @@ switch ($_REQUEST['action']) {
if (!$skip) {
$write = (isset($_POST['write']));
$download = (isset($_POST['download']));
$download_htaccess_channel = (isset($_POST['download_htaccess_channel']));
$download_htaccess_rest = (isset($_POST['download_htaccess_rest']));
$download_htaccess_play = (isset($_POST['download_htaccess_play']));
$write_htaccess_channel = (isset($_POST['write_htaccess_channel']));
$write_htaccess_rest = (isset($_POST['write_htaccess_rest']));
$write_htaccess_play = (isset($_POST['write_htaccess_play']));
$created_config = true;
if ($write_htaccess_channel || $download_htaccess_channel || $all) {
$created_config = $created_config && install_rewrite_rules($htaccess_channel_file, $_POST['web_path'], $download_htaccess_channel);
}
if ($write_htaccess_rest || $download_htaccess_rest || $all) {
$created_config = $created_config && install_rewrite_rules($htaccess_rest_file, $_POST['web_path'], $download_htaccess_rest);
}

13
lib/class/channel.class.php
View file

@ -37,6 +37,7 @@ class Channel extends database_object implements media, library_item
public $loop;
public $bitrate;
public $name;
public $description;
public $tags;
public $f_tags;
@ -232,6 +233,18 @@ class Channel extends database_object implements media, library_item
return 'default';
}
public function get_description()
{
return $this->description;
}
public function display_art($thumb = 2)
{
if (Art::has_db($this->id, 'channel')) {
Art::display('channel', $this->id, $this->get_fullname(), $thumb, $this->link);
}
}
public function get_target_object()
{
$object = null;

12
lib/class/live_stream.class.php
View file

@ -156,6 +156,18 @@ class Live_Stream extends database_object implements media, library_item
return 'default';
}
public function get_description()
{
return null;
}
public function display_art($thumb = 2)
{
if (Art::has_db($this->id, 'live_stream')) {
Art::display('live_stream', $this->id, $this->get_fullname(), $thumb, $this->link);
}
}
/**
* update
* This is a static function that takes a key'd array for input

17
lib/class/update.class.php
View file

@ -2552,6 +2552,7 @@ class Update
$htaccess_play_file = AmpConfig::get('prefix') . '/play/.htaccess';
$htaccess_rest_file = AmpConfig::get('prefix') . '/rest/.htaccess';
$htaccess_channel_file = AmpConfig::get('prefix') . '/channel/.htaccess';
$ret = true;
if (!is_readable($htaccess_play_file)) {
@ -2586,6 +2587,22 @@ class Update
}
}
if (!is_readable($htaccess_channel_file)) {
$created = false;
if (check_htaccess_channel_writable()) {
if (!install_rewrite_rules($htaccess_channel_file, AmpConfig::get('raw_web_path'), false)) {
Error::add('general', T_('File copy error.'));
} else {
$created = true;
}
}
if (!$created) {
Error::add('general', T_('Cannot copy default .htaccess file.') . ' Please copy <b>' . $htaccess_channel_file . '.dist</b> to <b>' . $htaccess_channel_file . '</b>.');
$ret = false;
}
}
return $ret;
}

6
lib/debug.lib.php
View file

@ -263,6 +263,12 @@ function check_config_writable()
|| (!file_exists(AmpConfig::get('prefix') . '/config/ampache.cfg.php') && is_writeable(AmpConfig::get('prefix') . '/config/')));
}
function check_htaccess_channel_writable()
{
return ((file_exists(AmpConfig::get('prefix') . '/channel/.htaccess') && is_writable(AmpConfig::get('prefix') . '/channel/.htaccess'))
|| (!file_exists(AmpConfig::get('prefix') . '/channel/.htaccess') && is_writeable(AmpConfig::get('prefix') . '/channel/')));
}
function check_htaccess_rest_writable()
{
return ((file_exists(AmpConfig::get('prefix') . '/rest/.htaccess') && is_writable(AmpConfig::get('prefix') . '/rest/.htaccess'))

15
templates/show_install_config.inc.php
View file

@ -183,6 +183,21 @@ require $prefix . '/templates/install_header.inc.php';
<div id="collapseConfigFiles" class="panel-collapse collapse <?php if(isset($created_config) && !$created_config) echo "in"; ?>">
<div class="panel-body">
<?php if (install_check_server_apache()) { ?>
<div class="col-sm-4">&nbsp;</div><div class="col-sm-8">&nbsp;</div>
<div class="col-sm-4 control-label">
<?php echo T_('channel/.htaccess action'); ?>
</div>
<div class="col-sm-8">
<button type="submit" class="btn btn-warning" name="download_htaccess_channel"><?php echo T_('Download'); ?></button>
<button type="submit" class="btn btn-warning" name="write_htaccess_channel" <?php if (!check_htaccess_channel_writable()) { echo "disabled "; } ?>>
<?php echo T_('Write'); ?>
</button>
</div>
<div class="col-sm-4 control-label"><?php echo T_('channel/.htaccess exists?'); ?></div>
<div class="col-sm-8"><?php echo debug_result(is_readable($htaccess_channel_file)); ?></div>
<div class="col-sm-4 control-label"><?php echo T_('channel/.htaccess configured?'); ?></div>
<div class="col-sm-8"><?php echo debug_result(install_check_rewrite_rules($htaccess_channel_file, $web_path_guess)); ?></div>
<div class="col-sm-4">&nbsp;</div><div class="col-sm-8">&nbsp;</div>
<div class="col-sm-4 control-label">
<?php echo T_('rest/.htaccess action'); ?>