Congegni/sintonia
7
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

cc-2182: Convert back to restful design

Browse source 
-done
This commit is contained in:
martin 2011-05-02 16:33:37 -04:00
parent 9e01e389ea
commit 8e2019a935
10 changed files with 9 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

3
airtime_mvc/application/configs/conf.php
View file

@ -6,7 +6,7 @@
* /etc/airtime/recorder.cfg
*/
define('AIRTIME_VERSION', '1.8.1');
define('AIRTIME_VERSION', '1.9.0-devel');
define('AIRTIME_COPYRIGHT_DATE', '2010-2011');
define('AIRTIME_REST_VERSION', '1.1');
@ -78,6 +78,7 @@ class Config {
$CC_CONFIG['dsn']['username'] = $values['database']['dbuser'];
$CC_CONFIG['dsn']['password'] = $values['database']['dbpass'];
$CC_CONFIG['dsn']['hostspec'] = $values['database']['host'];
$CC_CONFIG['dsn']['phptype'] = 'pgsql';
$CC_CONFIG['dsn']['database'] = $values['database']['dbname'];
$CC_CONFIG['apiKey'] = array($values['general']['api_key']);

2
airtime_mvc/application/controllers/ApiController.php
View file

@ -163,7 +163,7 @@ class ApiController extends Zend_Controller_Action
$this->_helper->viewRenderer->setNoRender(true);
$api_key = $this->_getParam('api_key');
if(!in_array($api_key, $CC_CONFIG["apiKey"]))
{
header('HTTP/1.0 401 Unauthorized');

3
airtime_mvc/application/models/StoredFile.php
View file

@ -1513,8 +1513,7 @@ class StoredFile {
public function getFileUrl()
{
global $CC_CONFIG;
return "http://$CC_CONFIG[baseUrl]:$CC_CONFIG[basePort]/".$this->gunid.".".$this->getFileExtension();
//return $CC_CONFIG["base_url"]..$this->gunid.".".$this->getFileExtension();
return "http://$CC_CONFIG[baseUrl]:$CC_CONFIG[basePort]/api/get-media/file/".$this->gunid.".".$this->getFileExtension();
}
/**