diff --git a/LICENSE_3RD_PARTY b/LICENSE_3RD_PARTY
index 892af37a1..06dcf9016 100644
--- a/LICENSE_3RD_PARTY
+++ b/LICENSE_3RD_PARTY
@@ -29,8 +29,19 @@ Linked code:
- License: LGPLv3
* Soundcloud php api wrapper
- - https://github.com/mptre/php-soundcloud/blob/master/Services/Soundcloud.php
+ - Web site: https://github.com/mptre/php-soundcloud/blob/master/Services/Soundcloud.php
- License: MIT
+ - Compatible with the GPL: Yes. See http://www.gnu.org/licenses/license-list.html
+
+ * Kombu
+ - Web site: http://pypi.python.org/pypi/kombu/
+ - License: New BSD
+ - Compatible with GPLv3? Yes.
+
+ * PHP-AMQPLIB
+ - Web site: https://github.com/tnc/php-amqplib
+ - License: LGPLv2.1
+ - Compatible with GPLv3? Yes
----------------
Non-linked code:
diff --git a/application/configs/conf.php b/application/configs/conf.php
index 74c3b10ac..b96db1f1d 100644
--- a/application/configs/conf.php
+++ b/application/configs/conf.php
@@ -61,38 +61,6 @@ $CC_CONFIG = array(
'zendPath' => dirname(__FILE__).'/../../library/Zend',
'phingPath' => dirname(__FILE__).'/../../library/phing',
- // name of admin group
- //'AdminsGr' => 'Admins',
-
- // name of station preferences group
-// 'StationPrefsGr'=> 'StationPrefs',
-
- // name of 'all users' group
- //'AllGr' => 'All',
-
- /* ==================================== application-specific configuration */
-// 'objtypes' => array(
-// 'Storage' => array(/*'Folder',*/ 'File' /*, 'Replica'*/),
-// 'File' => array(),
-// 'audioclip' => array(),
-// 'playlist' => array(),
-// ),
-// 'allowedActions'=> array(
-// 'File' => array('editPrivs', 'write', 'read'),
-// 'audioclip' => array('editPrivs', 'write', 'read'),
-// 'playlist' => array('editPrivs', 'write', 'read'),
-// ),
-// 'allActions' => array(
-// 'editPrivs', 'write', 'read', 'subjects'
-// ),
-
- /* =================================================== cron configuration */
- 'cronUserName' => 'www-data',
-# 'lockfile' => dirname(__FILE__).'/cron/cron.lock',
- 'lockfile' => dirname(__FILE__).'/stor/buffer/cron.lock',
- 'cronfile' => dirname(__FILE__).'/cron/croncall.php',
- 'paramdir' => dirname(__FILE__).'/cron/params',
-// 'systemPrefId' => "0", // ID for system prefs in prefs table
);
// Add database table names
@@ -119,11 +87,6 @@ $CC_CONFIG['permSequence'] = $CC_CONFIG['permTable'].'_id';
$CC_CONFIG['subjSequence'] = $CC_CONFIG['subjTable'].'_id';
$CC_CONFIG['smembSequence'] = $CC_CONFIG['smembTable'].'_id';
-// System users/groups - they cannot be deleted
-//$CC_CONFIG['sysSubjs'] = array(
-// 'root', /*$CC_CONFIG['AdminsGr'],*/ /*$CC_CONFIG['AllGr'],*/ $CC_CONFIG['StationPrefsGr']
-//);
-
// Add libs to the PHP path
$old_include_path = get_include_path();
set_include_path('.'.PATH_SEPARATOR.$CC_CONFIG['pearPath']
diff --git a/application/models/StoredFile.php b/application/models/StoredFile.php
index ecff91caa..cd98aff60 100644
--- a/application/models/StoredFile.php
+++ b/application/models/StoredFile.php
@@ -1481,7 +1481,8 @@ class StoredFile {
public function getFileUrl()
{
global $CC_CONFIG;
- return "http://".$CC_CONFIG["storageUrlHost"]
+ return "http://$CC_CONFIG[storageUrlHost]"
+ .":$CC_CONFIG[storageUrlPort]"
.$CC_CONFIG["apiPath"]."get-media/file/"
.$this->gunid.".".$this->getFileExtension();
}
diff --git a/build/schema.xml b/build/schema.xml
index f00ad14fb..3bd235e09 100644
--- a/build/schema.xml
+++ b/build/schema.xml
@@ -24,13 +24,6 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/install/airtime-install.php b/install/airtime-install.php
index 1d350f1e1..a0428878c 100644
--- a/install/airtime-install.php
+++ b/install/airtime-install.php
@@ -52,9 +52,6 @@ AirtimeInstall::CreateSymlinks($CC_CONFIG["storageDir"]);
echo "* Importing Sample Audio Clips".PHP_EOL;
system(__DIR__."/../utils/airtime-import --copy ../audio_samples/ > /dev/null");
-echo "* Python eggs Setup".PHP_EOL;
-AirtimeInstall::SetUpPythonEggs();
-
echo PHP_EOL."*** Pypo Installation ***".PHP_EOL;
system("python ".__DIR__."/../python_apps/pypo/install/pypo-install.py");
diff --git a/install/installInit.php b/install/installInit.php
index 1efaa4833..d720daaab 100644
--- a/install/installInit.php
+++ b/install/installInit.php
@@ -191,13 +191,6 @@ class AirtimeInstall {
system($command);
}
- public static function SetUpPythonEggs()
- {
- //install poster streaming upload
- $command = "sudo easy_install poster";
- @exec($command);
- }
-
public static function DeleteFilesRecursive($p_path)
{
$command = "rm -rf $p_path";