Merge branch 'master' of dev.sourcefabric.org:campcaster

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:

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']

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();
     }

build/schema.xml

@@ -24,13 +24,6 @@
       <index-column name="token"/>
     </index>
   </table>
-  <table name="cc_backup" phpName="CcBackup">
-    <column name="token" phpName="Token" type="VARCHAR" size="64" primaryKey="true" required="true"/>
-    <column name="sessionid" phpName="Sessionid" type="VARCHAR" size="64" required="true"/>
-    <column name="status" phpName="Status" type="VARCHAR" size="32" required="true"/>
-    <column name="fromtime" phpName="Fromtime" type="TIMESTAMP" required="true"/>
-    <column name="totime" phpName="Totime" type="TIMESTAMP" required="true"/>
-  </table>
   <table name="cc_files" phpName="CcFiles">
     <column name="id" phpName="DbId" type="INTEGER" primaryKey="true" autoIncrement="true" required="true"/>
     <column name="gunid" phpName="DbGunid" type="char" size="32" required="true"/>
@@ -295,45 +288,4 @@
       <unique-column name="login"/>
     </unique>
   </table>
-  <table name="cc_trans" phpName="CcTrans">
-    <column name="id" phpName="Id" type="INTEGER" primaryKey="true" autoIncrement="true" required="true"/>
-    <column name="trtok" phpName="Trtok" type="CHAR" size="16" required="true"/>
-    <column name="direction" phpName="Direction" type="VARCHAR" size="128" required="true"/>
-    <column name="state" phpName="State" type="VARCHAR" size="128" required="true"/>
-    <column name="trtype" phpName="Trtype" type="VARCHAR" size="128" required="true"/>
-    <column name="lock" phpName="Lock" type="CHAR" size="1" required="true" defaultValue="N"/>
-    <column name="target" phpName="Target" type="VARCHAR" size="255" required="false" defaultValue="NULL"/>
-    <column name="rtrtok" phpName="Rtrtok" type="CHAR" size="16" required="false" defaultValue="NULL"/>
-    <column name="mdtrtok" phpName="Mdtrtok" type="CHAR" size="16" required="false"/>
-    <column name="gunid" phpName="Gunid" type="char" size="32" required="false"/>
-    <column name="pdtoken" phpName="Pdtoken" type="BIGINT" required="false"/>
-    <column name="url" phpName="Url" type="VARCHAR" size="255" required="false"/>
-    <column name="localfile" phpName="Localfile" type="VARCHAR" size="255" required="false"/>
-    <column name="fname" phpName="Fname" type="VARCHAR" size="255" required="false"/>
-    <column name="title" phpName="Title" type="VARCHAR" size="255" required="false"/>
-    <column name="expectedsum" phpName="Expectedsum" type="CHAR" size="32" required="false"/>
-    <column name="realsum" phpName="Realsum" type="CHAR" size="32" required="false"/>
-    <column name="expectedsize" phpName="Expectedsize" type="INTEGER" required="false"/>
-    <column name="realsize" phpName="Realsize" type="INTEGER" required="false"/>
-    <column name="uid" phpName="Uid" type="INTEGER" required="false"/>
-    <column name="errmsg" phpName="Errmsg" type="VARCHAR" size="255" required="false"/>
-    <column name="jobpid" phpName="Jobpid" type="INTEGER" required="false"/>
-    <column name="start" phpName="Start" type="TIMESTAMP" required="false"/>
-    <column name="ts" phpName="Ts" type="TIMESTAMP" required="false"/>
-    <index name="cc_trans_gunid_idx">
-      <index-column name="gunid"/>
-    </index>
-    <unique name="cc_trans_id_idx">
-      <unique-column name="id"/>
-    </unique>
-    <index name="cc_trans_state_idx">
-      <index-column name="state"/>
-    </index>
-    <unique name="cc_trans_token_idx">
-      <unique-column name="pdtoken"/>
-    </unique>
-    <unique name="cc_trans_trtok_idx">
-      <unique-column name="trtok"/>
-    </unique>
-  </table>
 </database>

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");
 

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";