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

LICENSE_3RD_PARTY

@@ -58,6 +58,10 @@ Non-linked code:
 
  * mp3cut from the package poc-streamer
 
+ * ecasound 2.7.2
+   - Web site: http://www.eca.cx/ecasound/
+   - License: GPLv2
+
  * jQuery 
    - Web site: http://jquery.com/
    - License: MIT and GPL.  See http://jquery.org/license

install/airtime-install.php

@@ -1,7 +1,6 @@
 <?php
 /**
  * @package Airtime
- * @subpackage StorageServer
  * @copyright 2010 Sourcefabric O.P.S.
  * @license http://www.gnu.org/licenses/gpl.txt
  */
@@ -20,34 +19,33 @@ require_once(dirname(__FILE__).'/installInit.php');
 
 echo "******************************** Install Begin *********************************".PHP_EOL;
 
-checkIfRoot();
+AirtimeInstall::ExitIfNotRoot();
-createAPIKey();
+AirtimeInstall::CreateApiKey();
-updateINIKeyValues('../build/build.properties', 'project.home', realpath(__dir__.'/../'));
+AirtimeInstall::UpdateIniValue('../build/build.properties', 'project.home', realpath(__dir__.'/../'));
 
 
 echo PHP_EOL."*** Database Installation ***".PHP_EOL;
 
 echo "* Creating Airtime Database User".PHP_EOL;
-createAirtimeDatabaseUser();
+AirtimeInstall::CreateDatabaseUser();
 
 echo "* Creating Airtime Database".PHP_EOL;
-createAirtimeDatabase();
+AirtimeInstall::CreateDatabase();
 
-
+AirtimeInstall::DbConnect(true);
-airtime_db_connect(true);
 
 echo "* Install Postgresql Scripting Language".PHP_EOL;
-installPostgresScriptingLanguage();
+AirtimeInstall::InstallPostgresScriptingLanguage();
 
 echo "* Creating Database Tables".PHP_EOL;
-createAirtimeDatabaseTables();
+AirtimeInstall::CreateDatabaseTables();
-doctrineMigrateTables(__DIR__);
+AirtimeInstall::MigrateTables(__DIR__);
 
 echo "* Storage Directory Setup".PHP_EOL;
-storageDirectorySetup($CC_CONFIG);
+AirtimeInstall::SetupStorageDirectory($CC_CONFIG);
 
 echo "* Setting Dir Permissions".PHP_EOL;
-install_setDirPermissions($CC_CONFIG["storageDir"]);
+AirtimeInstall::ChangeDirOwnerToWebserver($CC_CONFIG["storageDir"]);
 
 echo "* Importing Sample Audio Clips".PHP_EOL;
 system(__DIR__."/../utils/airtime-import --copy ../audio_samples/ > /dev/null");

install/airtime-uninstall.php

@@ -18,13 +18,13 @@ require_once(dirname(__FILE__).'/../application/configs/conf.php');
 require_once(dirname(__FILE__).'/installInit.php');
 
 // Need to check that we are superuser before running this.
-checkIfRoot();
+AirtimeInstall::ExitIfNotRoot();
 
 
 echo "******************************* Uninstall Begin ********************************".PHP_EOL;
 //------------------------------------------------------------------------
 // Delete the database
-// Note: Do not put a call to airtime_db_connect()
+// Note: Do not put a call to AirtimeInstall::DbConnect()
 // before this function, even if you called $CC_DBC->disconnect(), there will
 // still be a connection to the database and you wont be able to delete it.
 //------------------------------------------------------------------------
@@ -38,19 +38,22 @@ $command = "sudo -u postgres dropdb {$CC_CONFIG['dsn']['database']} 2> /dev/null
 //------------------------------------------------------------------------
 if ($dbDeleteFailed) {
     echo " * Couldn't delete the database, so deleting all the DB tables...".PHP_EOL;
-  airtime_db_connect(true);
+    AirtimeInstall::DbConnect(true);
 
     if (!PEAR::isError($CC_DBC)) {
         $sql = "select * from pg_tables where tableowner = 'airtime'";
-      $rows = airtime_get_query($sql);
+        $rows = $CC_DBC->GetAll($sql);
+        if (PEAR::isError($result)) {
+            $rows = array();
+        }
 
-      foreach ($rows as $row){
+        foreach ($rows as $row) {
             $tablename = $row["tablename"];
             echo "   * Removing database table $tablename...";
 
-          if (airtime_db_table_exists($tablename)){
+            if (AirtimeInstall::DbTableExists($tablename)){
                 $sql = "DROP TABLE $tablename CASCADE";
-              airtime_install_query($sql, false);
+                AirtimeInstall::InstallQuery($sql, false);
 
                 $CC_DBC->dropSequence($tablename."_id");
             }
@@ -75,7 +78,7 @@ if ($results == 0) {
 //------------------------------------------------------------------------
 // Delete files
 //------------------------------------------------------------------------
-airtime_uninstall_delete_files($CC_CONFIG['storageDir']);
+AirtimeInstall::DeleteFilesRecursive($CC_CONFIG['storageDir']);
 
 
 $command = "python ".__DIR__."/../pypo/install/pypo-uninstall.py";

install/airtime-upgrade.php

@@ -17,13 +17,13 @@ if (isset($arr["DOCUMENT_ROOT"]) && ($arr["DOCUMENT_ROOT"] != "") ) {
 
 require_once(dirname(__FILE__).'/installInit.php');
 
-checkIfRoot();
+AirtimeInstall::ExitIfNotRoot();
 
 echo "******************************** Update Begin *********************************".PHP_EOL;
-updateINIKeyValues('../build/build.properties', 'project.home', realpath(__dir__.'/../'));
+AirtimeInstall::UpdateIniValue('../build/build.properties', 'project.home', realpath(__dir__.'/../'));
 
 echo PHP_EOL."*** Updating Database Tables ***".PHP_EOL;
-doctrineMigrateTables(__DIR__);
+AirtimeInstall::MigrateTables(__DIR__);
 
 echo PHP_EOL."*** Updating Pypo ***".PHP_EOL;
 system("python ".__DIR__."/../pypo/install/pypo-install.py");

install/installInit.php

@@ -7,8 +7,10 @@ if (!function_exists('pg_connect')) {
 require_once(dirname(__FILE__).'/../library/pear/DB.php');
 require_once(dirname(__FILE__).'/../application/configs/conf.php');
 
-function airtime_db_table_exists($p_name)
+class AirtimeInstall {
-{
+
+    static function DbTableExists($p_name)
+    {
         global $CC_DBC;
         $sql = "SELECT * FROM ".$p_name;
         $result = $CC_DBC->GetOne($sql);
@@ -16,20 +18,10 @@ function airtime_db_table_exists($p_name)
             return false;
         }
         return true;
-}
-
-function airtime_get_query($sql)
-{
-    global $CC_DBC;
-    $result = $CC_DBC->GetAll($sql);
-    if (PEAR::isError($result)) {
-        return array();
     }
-    return $result;
-}
 
-function airtime_install_query($sql, $verbose = true)
+    static function InstallQuery($sql, $verbose = true)
-{
+    {
         global $CC_DBC;
         $result = $CC_DBC->query($sql);
         if (PEAR::isError($result)) {
@@ -41,9 +33,10 @@ function airtime_install_query($sql, $verbose = true)
                 echo "done.\n";
             }
         }
-}
+    }
 
-function airtime_db_connect($p_exitOnError = true) {
+    static function DbConnect($p_exitOnError = true)
+    {
         global $CC_DBC, $CC_CONFIG;
         $CC_DBC = DB::connect($CC_CONFIG['dsn'], TRUE);
         if (PEAR::isError($CC_DBC)) {
@@ -59,19 +52,20 @@ function airtime_db_connect($p_exitOnError = true) {
             echo "* Connected to database".PHP_EOL;
             $CC_DBC->setFetchMode(DB_FETCHMODE_ASSOC);
         }
-}
+    }
 
-function install_setDirPermissions($filePath) {
+    static function ChangeDirOwnerToWebserver($filePath)
+    {
         global $CC_CONFIG;
         $success = chgrp($filePath, $CC_CONFIG["webServerUser"]);
         $fileperms=@fileperms($filePath);
         $fileperms = $fileperms | 0x0010; // group write bit
         $fileperms = $fileperms | 0x0400; // group sticky bit
         chmod($filePath, $fileperms);
-}
+    }
 
-function rand_string($len=20, $chars = 'ABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789')
+    private static function GenerateRandomString($len=20, $chars = 'ABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789')
-{
+    {
         $string = '';
         for ($i = 0; $i < $len; $i++)
         {
@@ -79,24 +73,26 @@ function rand_string($len=20, $chars = 'ABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789')
             $string .= $chars{$pos};
         }
         return $string;
-}
+    }
 
-function createAPIKey(){
+    public static function CreateApiKey()
+    {
+        $api_key = AirtimeInstall::GenerateRandomString();
+        AirtimeInstall::UpdateIniValue(__DIR__.'/../build/airtime.conf', 'api_key', $api_key);
+        AirtimeInstall::UpdateIniValue(__DIR__.'/../pypo/config.cfg', 'api_key', "'$api_key'");
+    }
 
-    $api_key = rand_string();
+    public static function ExitIfNotRoot()
-    updateINIKeyValues(__DIR__.'/../build/airtime.conf', 'api_key', $api_key);
+    {
-    updateINIKeyValues(__DIR__.'/../pypo/config.cfg', 'api_key', "'$api_key'");
-}
-
-function checkIfRoot(){
         // Need to check that we are superuser before running this.
         if(exec("whoami") != "root"){
             echo "Must be root user.\n";
             exit(1);
         }
-}
+    }
 
-function updateINIKeyValues($filename, $property, $value){
+    public static function UpdateIniValue($filename, $property, $value)
+    {
         $lines = file($filename);
         $n=count($lines);
         for ($i=0; $i<$n; $i++) {
@@ -111,9 +107,10 @@ function updateINIKeyValues($filename, $property, $value){
             fwrite($fp, $lines[$i]);
         }
         fclose($fp);
-}
+    }
 
-function storageDirectorySetup($CC_CONFIG){
+    public static function SetupStorageDirectory($CC_CONFIG)
+    {
         global $CC_CONFIG, $CC_DBC;
          
         echo PHP_EOL."*** Directory Setup ***".PHP_EOL;
@@ -136,9 +133,10 @@ function storageDirectorySetup($CC_CONFIG){
             }
             $CC_CONFIG[$d] = $rp;
         }
-}
+    }
 
-function createAirtimeDatabaseUser(){
+    public static function CreateDatabaseUser()
+    {
         global $CC_CONFIG;
         // Create the database user
         $command = "sudo -u postgres psql postgres --command \"CREATE USER {$CC_CONFIG['dsn']['username']} "
@@ -148,11 +146,12 @@ function createAirtimeDatabaseUser(){
         if ($results == 0) {
             echo "* User {$CC_CONFIG['dsn']['username']} created.".PHP_EOL;
         } else {
-      echo "* User {$CC_CONFIG['dsn']['username']} already exists.".PHP_EOL;
+            echo "* Could not create user {$CC_CONFIG['dsn']['username']}: $output".PHP_EOL;
+        }
     }
-}
 
-function createAirtimeDatabase(){
+    public static function CreateDatabase()
+    {
         global $CC_CONFIG;
          
         $command = "sudo -u postgres createdb {$CC_CONFIG['dsn']['database']} --owner {$CC_CONFIG['dsn']['username']} 2> /dev/null";
@@ -160,37 +159,41 @@ function createAirtimeDatabase(){
         if ($results == 0) {
             echo "* Database '{$CC_CONFIG['dsn']['database']}' created.".PHP_EOL;
         } else {
-      echo "* Database '{$CC_CONFIG['dsn']['database']}' already exists.".PHP_EOL;
+            echo "* Could not create database '{$CC_CONFIG['dsn']['database']}': $output".PHP_EOL;
+        }
     }
-}
 
-function installPostgresScriptingLanguage(){
+    public static function InstallPostgresScriptingLanguage()
+    {
         global $CC_DBC;
         // Install postgres scripting language
         $langIsInstalled = $CC_DBC->GetOne('SELECT COUNT(*) FROM pg_language WHERE lanname = \'plpgsql\'');
         if ($langIsInstalled == '0') {
             echo "* Installing Postgres scripting language".PHP_EOL;
             $sql = "CREATE LANGUAGE 'plpgsql'";
-      airtime_install_query($sql, false);
+            AirtimeInstall::InstallQuery($sql, false);
         } else {
             echo "* Postgres scripting language already installed".PHP_EOL;
         }
-}
+    }
 
-
+    public static function CreateDatabaseTables()
-function createAirtimeDatabaseTables(){
+    {
         // Put Propel sql files in Database
         $command = __DIR__."/../library/propel/generator/bin/propel-gen ../build/ insert-sql 2>propel-error.log";
         @exec($command, $output, $results);
-}
+    }
 
-function doctrineMigrateTables($dir){
+    public static function MigrateTables($dir)
+    {
         $command = "php $dir/../library/doctrine/migrations/doctrine-migrations.phar --configuration=$dir/DoctrineMigrations/migrations.xml --db-configuration=$dir/../library/doctrine/migrations/migrations-db.php --no-interaction migrations:migrate";
         system($command);
-}
+    }
 
-function airtime_uninstall_delete_files($p_path)
+    public static function DeleteFilesRecursive($p_path)
-{
+    {
         $command = "rm -rf $p_path";
         exec($command);
+    }
+
 }

utils/CleanStor.php

@@ -84,10 +84,10 @@ function airtime_empty_db($db) {
     global $CC_CONFIG;
 
     if (!PEAR::isError($db)) {
-        if (airtime_db_table_exists($CC_CONFIG['filesTable'])) {
+        if (AirtimeInstall::DbTableExists($CC_CONFIG['filesTable'])) {
             echo " * Deleting from database table ".$CC_CONFIG['filesTable']."\n";
             $sql = "DELETE FROM ".$CC_CONFIG['filesTable'];
-            airtime_install_query($sql, false);
+            AirtimeInstall::InstallQuery($sql, false);
         }
         else {
             echo " * Skipping: database table ".$CC_CONFIG['filesTable']."\n";