Congegni
/
libretime
mirror of https://github.com/libretime/libretime.git
7
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

CC-2534: When copy files into storage folder it says wrong path name 

filter all functions via realpath which will make directories consistent
This commit is contained in:
martin 2011-07-12 17:05:40 -04:00
parent 6972150b19
commit 1411987b01
5 changed files with 8 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
airtime_mvc/application/controllers/ApiController.php
View File

@ -561,7 +561,7 @@ class ApiController extends Zend_Controller_Action
$request = $this->getRequest();
$api_key = $request->getParam('api_key');
$path = base64_decode($request->getParam('path'));
$path = realpath(base64_decode($request->getParam('path')))."/";
if (!in_array($api_key, $CC_CONFIG["apiKey"]))
{
@ -578,7 +578,7 @@ class ApiController extends Zend_Controller_Action
$request = $this->getRequest();
$api_key = $request->getParam('api_key');
$path = base64_decode($request->getParam('path'));
$path = realpath(base64_decode($request->getParam('path')))."/";
if (!in_array($api_key, $CC_CONFIG["apiKey"]))
{
@ -595,7 +595,7 @@ class ApiController extends Zend_Controller_Action
$request = $this->getRequest();
$api_key = $request->getParam('api_key');
$path = base64_decode($request->getParam('path'));
$path = realpath(base64_decode($request->getParam('path')))."/";
if (!in_array($api_key, $CC_CONFIG["apiKey"]))
{

6
airtime_mvc/application/models/MusicDir.php
View File

@ -157,15 +157,13 @@ class MusicDir {
public static function splitFilePath($p_filepath)
{
$mus_dir = self::getWatchedDirFromFilepath($p_filepath);
if(is_null($mus_dir)) {
return null;
}
$length_dir = strlen($mus_dir->getDirectory());
$length_filepath = strlen($p_filepath);
$length = $length_filepath - $length_dir;
$fp = substr($p_filepath, $length_dir+1, $length);
$fp = substr($p_filepath, $length_dir);
return array($mus_dir->getDirectory(), $fp);
}

2
airtime_mvc/application/models/StoredFile.php
View File

@ -417,7 +417,7 @@ class StoredFile {
$music_dir = MusicDir::getDirByPK($this->_file->getDbDirectory());
$filepath = $this->_file->getDbFilepath();
return $music_dir->getDirectory()."/".$filepath;
return $music_dir->getDirectory().$filepath;
}
/**

2
install/include/airtime-db-install.php
View File

@ -53,7 +53,7 @@ if (AirtimeInstall::$databaseTablesCreated) {
$ini = parse_ini_file(__DIR__."/airtime-install.ini");
$stor_dir = $ini["storage_dir"];
$stor_dir = realpath($ini["storage_dir"])."/";
echo "* Inserting stor directory location $stor_dir into music_dirs table".PHP_EOL;
$sql = "INSERT INTO cc_music_dirs (directory, type) VALUES ('$stor_dir', 'stor')";

2
install/include/airtime-install.ini
View File

@ -1 +1 @@
storage_dir = /srv/airtime/stor
storage_dir = /srv/airtime/stor/