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

application/configs/navigation.php

@@ -16,7 +16,7 @@ $pages = array(
         'resource'	=>	'nowplaying'
 	),
 	array(
-		'label'      => 'Add Audio',
+		'label'      => 'Add Media',
 		'module'     => 'default',
 		'controller' => 'Plupload',
 		'action'     => 'plupload',

application/controllers/ScheduleController.php

@@ -161,7 +161,7 @@ class ScheduleController extends Zend_Controller_Action
             if (($user->isHost($show->getShowId()) || $user->isAdmin()) && !$show->isRecorded() && !$show->isRebroadcast()) {
 
                 $menu[] = array('action' => array('type' => 'ajax', 'url' => '/Schedule/schedule-show-dialog'.$params,
-                    'callback' => 'window["buildScheduleDialog"]'), 'title' => 'Add Content');
+                    'callback' => 'window["buildScheduleDialog"]'), 'title' => 'Add / Remove Content');
 
                 $menu[] = array('action' => array('type' => 'ajax', 'url' => '/Schedule/clear-show'.$params,
                             'callback' => 'window["scheduleRefetchEvents"]'), 'title' => 'Remove All Content');

install/DoctrineMigrations/Version20110312121200.php

@@ -0,0 +1,19 @@
+<?php
+
+namespace DoctrineMigrations;
+
+use Doctrine\DBAL\Migrations\AbstractMigration,
+    Doctrine\DBAL\Schema\Schema;
+
+class Version20110312121200 extends AbstractMigration
+{
+    public function up(Schema $schema)
+    {
+        $schema->dropTable("cc_backup");
+        $schema->dropTable("cc_trans");
+    }
+
+    public function down(Schema $schema)
+    {
+    }
+}

install/airtime-uninstall.php

@@ -39,7 +39,7 @@ $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;
-    AirtimeInstall::DbConnect(true);
+    AirtimeInstall::DbConnect(false);
 
     if (!PEAR::isError($CC_DBC)) {
         $sql = "select * from pg_tables where tableowner = 'airtime'";

install/installInit.php

@@ -214,8 +214,8 @@ class AirtimeInstall {
     }
 
     public static function RemoveSymlinks(){
-        exec("rm /usr/bin/airtime-import >/dev/null 2>&1");
-        exec("rm /usr/bin/airtime-clean-storage >/dev/null 2>&1");
+        exec("rm -f /usr/bin/airtime-import");
+        exec("rm -f /usr/bin/airtime-clean-storage");
     }