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

Conflicts:
	application/controllers/LibraryController.php
	application/controllers/SearchController.php

CREDITS

@@ -6,7 +6,8 @@ Version 1.6.0
 -------------
 This version marks a major change to the project, completely replacing the
 custom audio player with liquidsoap, dropping the custom desktop GUI, and 
-completely rewriting the web interface.
+completely rewriting the web interface. The project has also been renamed
+from "Campcaster" to "Airtime" for this release.
 
 Paul Baranowski (paul.baranowski@sourcefabric.org)
   Role: Project Lead / Software Developer
@@ -20,6 +21,12 @@ Naomi Aro (naomi.aro@sourcefabric.org)
     - New User Interface
     - Conversion to Propel DB backend
 
+Martin Konecny (martin.konecny@sourcefabric.org)
+  Role:Software Developer
+  Highlights:
+    - New User Interface
+    - Scheduler
+
 Daniel James
   Role: Documentor & QA
 

INSTALL

@@ -2,22 +2,22 @@
 
     Copyright (c) 2010 Sourcefabric O.P.S.
 
-    This file is part of the Campcaster project.
+    This file is part of the Airtime project.
     http://campcaster.sourcefabric.org/
     To report bugs, send an e-mail to contact@sourcefabric.org
 
-    Campcaster is free software; you can redistribute it and/or modify
+    Airtime is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
     the Free Software Foundation; either version 2 of the License, or
     (at your option) any later version.
 
-    Campcaster is distributed in the hope that it will be useful,
+    Airtime is distributed in the hope that it will be useful,
     but WITHOUT ANY WARRANTY; without even the implied warranty of
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
     GNU General Public License for more details.
 
     You should have received a copy of the GNU General Public License
-    along with Campcaster; if not, write to the Free Software
+    along with Airtime; if not, write to the Free Software
     Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
 --------------------------------------------------------------------------------

README

@@ -1,94 +1,45 @@
 =========================================================================
-==========================   CAMPCASTER   ===============================
+==========================    AIRTIME   =================================
 =========================================================================
-Campcaster is the first free and open radio management software that 
+Airtime is an open source application that provides remote automation 
-provides live studio broadcast capabilities as well as remote automation
+of a radio station.
-in one integrated system.
 
-Campcaster has three audio outputs: one for live broadcasting, one for
+Major features:
-previewing audio, and one for automated scheduled playback.
-
-Major features of Campcaster:
- * Live, in-studio playout.  Campcaster Studio enables station personnel
-   to play out both individual sound files and playlists such as 
-   advertising blocks or entire programs.
  * Web-based remote station management.  Authorized personnel can add
    program material, create playlists, and schedule programming all via 
-   Campcaster's web interface.
+   a web interface.
- * Automation.  Campcaster has a scheduler function that enables users to
+ * Automation.  Airtime has a scheduler function that enables users to
    set playlists for playback at a date and time of their choosing.
    Playlists can be played back multiple times.
- * Playlists.  Campcaster allows users to create playlists that can be 
+ * Playlists.  Airtime allows users to create playlists that can be 
    either played on-demand in the Studio or in automated mode.  Playlists
    can be nested inside each other, so for example, a playlist with a 
    block of ads can be inside of a playlist with a music program.
  * Centralized archives of station program material.  Station personnel
    have a searchable, browseable central archive that is accessible both
    in the office and via the web.
- * Solid, fast playback.  Campcaster uses the popular Gstreamer 
+ * Solid, fast playback.  Airtime uses the open source Liquidsoap 
    multimedia framework for clean, reliable, fast playback. 
- * Program sharing.  Stations can share both playlists and files with a 
-   designated, centralized 'network hub.'  This enables the creation of 
-   'virtual radio networks' connected via the Internet. 
- * Search-based backup.  You can backup all station archives at the click
-   of a button, or only backup certain files based on search terms, so 
-   that backup files can be made of only a certain program or of all 
-   files created by a certain user.
- * Localization.  Campcaster is multilingual and supports Unicode.  It
-   also is very easy to create language localizations.
- * No restrictions.  Multiple instances of the Campcaster Studio program 
-   can access the same archive on the office network, and there are no 
-   worries about hardware dongles or keys limiting access on multiple PCs.
- * Innovative design.  Campcaster's user interface – the product of 
-   Parsons School of Design's “Design and Communication” program -  
-   introduces a number of innovations, including the 'Scratchpad', 
-   a list of recently-used files and playlists.
  * Open, extensible architecture.  Stations are free to extend and alter 
-   all parts of the Campcaster program code, which makes extensive use 
+   all parts of the program code.
-   of XML-RPC APIs.
 
 
 INSTALLATION
 ------------
 Please see this page for a typical user installation:
-http://en.flossmanuals.net/Campcaster
+http://en.flossmanuals.net/Airtime
 
 If you are a developer, please see this page:
-http://wiki.sourcefabric.org/display/CC/Campcaster+Dev+Site
+http://wiki.sourcefabric.org/display/CC/Airtime+Dev+Site
 
 Quick links to our resources
 ----------------------------
-    User Manual: http://en.flossmanuals.net/Campcaster/Introduction
+    User Manual: http://en.flossmanuals.net/Airtime/Introduction
     Forums and mailing lists: http://forum.sourcefabric.org
     Bug Tracking: http://dev.sourcefabric.org
     Code view/review: http://code.sourcefabric.org
     Public source code hosting: http://github.com/sourcefabric
-    Download link: https://sourceforge.net/projects/campcaster/files/
+    Download link: https://sourceforge.net/projects/airtime/files/
     Developer's wiki: http://wiki.sourcefabric.org
 
 
-
--------------------------------------------------------------------------
-
-    Copyright (c) 2010 Sourcefabric O.P.S.
-
-    This file is part of the Campcaster project.
-    http://campcaster.sourcefabric.org/
-    To report bugs, send an e-mail to campcaster-support@lists.sourcefabric.org
-
-    Campcaster is free software; you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation; either version 2 of the License, or
-    (at your option) any later version.
-
-    Campcaster is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with Campcaster; if not, write to the Free Software
-    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-
--------------------------------------------------------------------------
-

application/configs/application.ini

@@ -12,9 +12,9 @@ resources.view[] =
 resources.db.adapter = "Pdo_Pgsql"
 resources.db.params.charset = "utf8"
 resources.db.params.host = "localhost"
-resources.db.params.username = "campcaster"
+resources.db.params.username = "airtime"
-resources.db.params.password = "campcaster"
+resources.db.params.password = "airtime"
-resources.db.params.dbname = "campcaster"
+resources.db.params.dbname = "airtime"
 
 [staging : production]
 

application/configs/conf.php

@@ -8,11 +8,11 @@ global $CC_CONFIG;
 $CC_CONFIG = array(
     // Database config
     'dsn'           => array(
-        'username'      => 'campcaster',
+        'username'      => 'airtime',
-        'password'      => 'campcaster',
+        'password'      => 'airtime',
         'hostspec'      => 'localhost',
         'phptype'       => 'pgsql',
-        'database'      => 'campcaster',
+        'database'      => 'airtime',
     ),
 
     // Name of the web server user

application/configs/propel-config.php

@@ -9,7 +9,7 @@ $conf = array (
       'adapter' => 'pgsql',
       'connection' => 
       array (
-        'dsn' => 'pgsql:host=localhost;port=5432;dbname=campcaster;user=campcaster;password=campcaster',
+        'dsn' => 'pgsql:host=localhost;port=5432;dbname=airtime;user=airtime;password=airtime',
       ),
     ),
     'default' => 'campcaster',

application/controllers/LibraryController.php

@@ -29,7 +29,7 @@ class LibraryController extends Zend_Controller_Action
 
     public function indexAction()
     {
-        $this->view->headScript()->appendFile('/js/campcaster/onready/library.js','text/javascript');
+        $this->view->headScript()->appendFile('/js/airtime/onready/library.js','text/javascript');
 		$this->view->headScript()->appendFile('/js/contextmenu/jjmenu.js','text/javascript');
 		$this->view->headLink()->appendStylesheet('/css/contextmenu.css');
 	
@@ -128,7 +128,7 @@ class LibraryController extends Zend_Controller_Action
 
     public function contentsAction()
     {
-        $this->view->headScript()->appendFile('/js/campcaster/library/library.js','text/javascript');
+        $this->view->headScript()->appendFile('/js/airtime/library/library.js','text/javascript');
 
 		$this->_helper->viewRenderer->setResponseSegment('library'); 
 

application/controllers/PlaylistController.php

@@ -136,7 +136,7 @@ class PlaylistController extends Zend_Controller_Action
 
     public function editAction()
     {
-        $this->view->headScript()->appendFile('/js/campcaster/playlist/playlist.js','text/javascript'); 
+        $this->view->headScript()->appendFile('/js/airtime/playlist/playlist.js','text/javascript'); 
 
 		$pl_id = $this->_getParam('id', null);
 		$display = $this->_getParam('view', null);

application/controllers/PluploadController.php

@@ -165,7 +165,7 @@ class PluploadController extends Zend_Controller_Action
                                 
         $view->headScript()->appendFile('/js/plupload/plupload.full.min.js','text/javascript');
 		$view->headScript()->appendFile('/js/plupload/jquery.plupload.queue.min.js','text/javascript');
-		$view->headScript()->appendFile('/js/campcaster/library/plupload.js','text/javascript');
+		$view->headScript()->appendFile('/js/airtime/library/plupload.js','text/javascript');
 
 		$view->headLink()->appendStylesheet('/css/plupload.queue.css');
     }

application/controllers/ScheduleController.php

@@ -29,7 +29,7 @@ class ScheduleController extends Zend_Controller_Action
 		$this->view->headScript()->appendFile('/js/contextmenu/jquery.contextMenu.js','text/javascript');
 		$this->view->headScript()->appendFile('/js/qtip/jquery.qtip-1.0.0.min.js','text/javascript');
 
-    	$this->view->headScript()->appendFile('/js/campcaster/schedule/schedule.js','text/javascript');
+    	$this->view->headScript()->appendFile('/js/airtime/schedule/schedule.js','text/javascript');
 
 		$this->view->headLink()->appendStylesheet('/css/jquery.contextMenu.css');
 		$this->view->headLink()->appendStylesheet('/css/fullcalendar.css');

application/controllers/SearchController.php

@@ -43,9 +43,9 @@ class SearchController extends Zend_Controller_Action
 
     public function indexAction()
     {
-        $this->_helper->layout->setLayout('search');
+		$this->_helper->layout->setLayout('search');
 
-		$this->view->headScript()->appendFile('/js/campcaster/onready/search.js','text/javascript');
+		$this->view->headScript()->appendFile('/js/airtime/onready/search.js','text/javascript');
 		$this->view->headScript()->appendFile('/js/contextmenu/jjmenu.js','text/javascript');
 		$this->view->headLink()->appendStylesheet('/css/contextmenu.css');
 
@@ -56,8 +56,8 @@ class SearchController extends Zend_Controller_Action
 
     public function displayAction()
     {
-        $this->view->headScript()->appendFile('/js/campcaster/library/advancedsearch.js','text/javascript');
+		$this->view->headScript()->appendFile('/js/airtime/library/advancedsearch.js','text/javascript');
-		//$this->view->headLink()->appendStylesheet('/css/library_search.css');
+		$this->view->headLink()->appendStylesheet('/css/library_search.css');
 
 		$this->_helper->viewRenderer->setResponseSegment('search'); 
 

application/controllers/SideplaylistController.php

@@ -17,7 +17,7 @@ class SideplaylistController extends Zend_Controller_Action
 
     public function indexAction()
     {
-		$this->view->headScript()->appendFile('/js/campcaster/library/spl.js','text/javascript');
+		$this->view->headScript()->appendFile('/js/airtime/library/spl.js','text/javascript');
 
 		$this->_helper->viewRenderer->setResponseSegment('spl'); 
 

application/layouts/scripts/layout.phtml

@@ -3,7 +3,7 @@
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head>
 	<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-	<title>Campcaster</title>
+	<title>Airtime</title>
 	<?php echo $this->headScript() ?>
 	<?php echo $this->headLink() ?>
 </head>

application/layouts/scripts/library.phtml

@@ -3,7 +3,7 @@
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head>
 	<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-	<title>Campcaster</title>
+	<title>Airtime</title>
 	<?php echo $this->headScript() ?>
 	<?php echo $this->headLink() ?>
 </head>

application/layouts/scripts/login.phtml

@@ -3,7 +3,7 @@
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head>
 	<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-	<title>Campcaster</title>
+	<title>Airtime</title>
 	<?php echo $this->headScript() ?>
 	<?php echo $this->headLink() ?>
 </head>

application/layouts/scripts/search.phtml

@@ -3,7 +3,7 @@
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head>
 	<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-	<title>Campcaster</title>
+	<title>Airtime</title>
 	<?php echo $this->headScript() ?>
 	<?php echo $this->headLink() ?>
 </head>

application/models/AccessRecur.php

@@ -5,7 +5,7 @@
  * Handles recursive accessPlaylist/releasePlaylist.
  * Should be 'required_once' from LocStor.php only.
  *
- * @package Campcaster
+ * @package Airtime
  * @subpackage StorageServer
  * @copyright 2010 Sourcefabric O.P.S.
  * @license http://www.gnu.org/licenses/gpl.txt

application/models/Alib.php

@@ -8,7 +8,7 @@ define('ALIBERR_NOTEXISTS', 31);
 /**
  * Authentication/authorization class
  *
- * @package Campcaster
+ * @package Airtime
  * @subpackage Alib
  * @copyright 2010 Sourcefabric O.P.S.
  * @license http://www.gnu.org/licenses/gpl.txt

application/models/Backup.php

@@ -3,7 +3,7 @@ define('BACKUP_EXT', 'tar');
 define('ACCESS_TYPE', 'backup');
 
 /**
- * @package Campcaster
+ * @package Airtime
  * @subpackage StorageServer
  * @copyright 2010 Sourcefabric O.P.S.
  * @license http://www.gnu.org/licenses/gpl.txt

application/models/BasicStor.php

@@ -106,9 +106,9 @@ require_once(dirname(__FILE__)."/Playlist.php");
 //        "dc:language" => "language");
 
 /**
- * Core of Campcaster file storage module
+ * Core of Airtime file storage module
  *
- * @package Campcaster
+ * @package Airtime
  * @subpackage StorageServer
  * @copyright 2010 Sourcefabric O.P.S.
  * @license http://www.gnu.org/licenses/gpl.txt
@@ -1494,7 +1494,7 @@ class BasicStor {
      * @param string $plid
      * 		Playlist gunid
      * @param string $aPath
-     * 		Absolute path part of imported file (e.g. /home/user/campcaster)
+     * 		Absolute path part of imported file (e.g. /home/user/airtime)
      * @param string $rPath
      * 		Relative path/filename part of imported file (e.g. playlists/playlist_1.smil)
      * @param string $ext

application/models/GreenBox.php

@@ -18,7 +18,7 @@ require_once("Transport.php");
  *
  * File storage module.
  *
- * @package Campcaster
+ * @package Airtime
  * @subpackage StorageServer
  * @copyright 2010 Sourcefabric O.P.S.
  * @license http://www.gnu.org/licenses/gpl.txt

application/models/LocStor.php

@@ -16,7 +16,7 @@ if (isset($WHITE_SCREEN_OF_DEATH) && $WHITE_SCREEN_OF_DEATH) {
  *
  * Local storage interface
  *
- * @package Campcaster
+ * @package Airtime
  * @subpackage StorageServer
  * @copyright 2010 Sourcefabric O.P.S.
  * @license http://www.gnu.org/licenses/gpl.txt
@@ -1362,7 +1362,7 @@ class LocStor extends BasicStor {
 
     /*===================================================== auxiliary methods */
     /**
-     * Dummy method - only returns Campcaster version
+     * Dummy method - only returns Airtime version
      *
      * @return string
      */

application/models/M3uPlaylist.php

@@ -4,7 +4,7 @@ define('INDCH', ' ');
 /**
  * M3uPlaylist class
  *
- * @package Campcaster
+ * @package Airtime
  * @subpackage StorageServer
  * @copyright 2010 Sourcefabric O.P.S.
  * @license http://www.gnu.org/licenses/gpl.txt
@@ -59,7 +59,7 @@ class M3uPlaylist {
      *
      * @param GreenBox $gb
      * @param string $aPath
-     * 		absolute path part of imported file (e.g. /home/user/campcaster)
+     * 		absolute path part of imported file (e.g. /home/user/airtime)
      * @param string $rPath
      * 		relative path/filename part of imported file
      *      (e.g. playlists/playlist_1.smil)
@@ -141,7 +141,7 @@ class M3uPlaylist {
      * @param string $data
      * 		local path to M3U file
      * @return string
-     * 		XML playlist in Campcaster playlist format
+     * 		XML playlist in Airtime playlist format
      */
     function convert2lspl(&$gb, $data)
     {
@@ -196,7 +196,7 @@ class M3uPlaylist {
 
 
 /**
- * @package Campcaster
+ * @package Airtime
  * @subpackage StorageServer
  * @copyright 2010 Sourcefabric O.P.S.
  * @license http://www.gnu.org/licenses/gpl.txt
@@ -231,7 +231,7 @@ class M3uPlaylistBodyElement {
 
 
 /**
- * @package Campcaster
+ * @package Airtime
  * @subpackage StorageServer
  * @copyright 2010 Sourcefabric O.P.S.
  * @license http://www.gnu.org/licenses/gpl.txt
@@ -257,7 +257,7 @@ class M3uPlaylistParElement {
 
 
 /**
- * @package Campcaster
+ * @package Airtime
  * @subpackage StorageServer
  * @copyright 2010 Sourcefabric O.P.S.
  * @license http://www.gnu.org/licenses/gpl.txt
@@ -313,7 +313,7 @@ class M3uPlaylistAudioElement {
 
 
 /**
- * @package Campcaster
+ * @package Airtime
  * @subpackage StorageServer
  * @copyright 2010 Sourcefabric O.P.S.
  * @license http://www.gnu.org/licenses/gpl.txt

application/models/Playlist.php

@@ -7,7 +7,7 @@ define('INDCH', ' ');
  *
  * remark: dcterms:extent format: hh:mm:ss.ssssss
  *
- * @package Campcaster
+ * @package Airtime
  * @subpackage StorageServer
  * @copyright 2010 Sourcefabric O.P.S.
  * @license http://www.gnu.org/licenses/gpl.txt
@@ -904,7 +904,7 @@ class Playlist {
 } // class Playlist
 
 /**
- * @package Campcaster
+ * @package Airtime
  * @subpackage StorageServer
  * @copyright 2010 Sourcefabric O.P.S.
  * @license http://www.gnu.org/licenses/gpl.txt
@@ -1014,7 +1014,7 @@ class PlaylistTagExport
 
 
 /**
- * @package Campcaster
+ * @package Airtime
  * @subpackage StorageServer
  * @copyright 2010 Sourcefabric O.P.S.
  * @license http://www.gnu.org/licenses/gpl.txt
@@ -1195,7 +1195,7 @@ class PlaylistElementExport {
 
 
 /**
- * @package Campcaster
+ * @package Airtime
  * @subpackage StorageServer
  * @copyright 2010 Sourcefabric O.P.S.
  * @license http://www.gnu.org/licenses/gpl.txt
@@ -1269,7 +1269,7 @@ class PlaylistAudioClipExport
 
 
 /**
- * @package Campcaster
+ * @package Airtime
  * @subpackage StorageServer
  * @copyright 2010 Sourcefabric O.P.S.
  * @license http://www.gnu.org/licenses/gpl.txt
@@ -1303,7 +1303,7 @@ class PlaylistFadeInfoExport
 
 
 /**
- * @package Campcaster
+ * @package Airtime
  * @subpackage StorageServer
  * @copyright 2010 Sourcefabric O.P.S.
  * @license http://www.gnu.org/licenses/gpl.txt

application/models/Prefs.php

@@ -5,7 +5,7 @@ require_once("GreenBox.php");
 /**
  * Preference storage class.
  *
- * @package Campcaster
+ * @package Airtime
  * @subpackage StorageServer
  * @copyright 2010 Sourcefabric O.P.S.
  * @license http://www.gnu.org/licenses/gpl.txt

application/models/Renderer.php

@@ -8,7 +8,7 @@ require_once("Playlist.php");
  *
  * Playlist to file rendering - PHP layer, caller to the renderer executable
  *
- * @package Campcaster
+ * @package Airtime
  * @subpackage StorageServer
  * @copyright 2010 Sourcefabric O.P.S.
  * @license http://www.gnu.org/licenses/gpl.txt

application/models/Restore.php

@@ -1,7 +1,7 @@
 <?php
 
 /**
- * @package Campcaster
+ * @package Airtime
  * @subpackage StorageServer
  * @copyright 2010 Sourcefabric O.P.S.
  * @license http://www.gnu.org/licenses/gpl.txt

application/models/SmilPlaylist.php

@@ -6,7 +6,7 @@ require_once("XmlParser.php");
 /**
  * SmilPlaylist class
  *
- * @package Campcaster
+ * @package Airtime
  * @subpackage StorageServer
  * @copyright 2010 Sourcefabric O.P.S.
  * @license http://www.gnu.org/licenses/gpl.txt
@@ -35,7 +35,7 @@ class SmilPlaylist {
      * @param GreenBox $gb
      * 		reference to GreenBox object
      * @param string $aPath
-     * 		absolute path part of imported file (e.g. /home/user/campcaster)
+     * 		absolute path part of imported file (e.g. /home/user/airtime)
      * @param string $rPath
      * 		relative path/filename part of imported file
      *      (e.g. playlists/playlist_1.smil)
@@ -92,7 +92,7 @@ class SmilPlaylist {
      * @param array $parr
      * 		array of subjid, aPath, plid, rPath
      * @return string
-     * 		XML of playlist in Campcaster playlist format
+     * 		XML of playlist in Airtime playlist format
      */
     public static function convert2lspl(&$gb, $data, &$gunids, $parr)
     {
@@ -119,7 +119,7 @@ class SmilPlaylist {
 
 
 /**
- * @package Campcaster
+ * @package Airtime
  * @subpackage StorageServer
  * @copyright 2010 Sourcefabric O.P.S.
  * @license http://www.gnu.org/licenses/gpl.txt
@@ -158,7 +158,7 @@ class SmilPlaylistBodyElement {
 
 
 /**
- * @package Campcaster
+ * @package Airtime
  * @subpackage StorageServer
  * @copyright 2010 Sourcefabric O.P.S.
  * @license http://www.gnu.org/licenses/gpl.txt
@@ -186,7 +186,7 @@ class SmilPlaylistParElement {
 
 
 /**
- * @package Campcaster
+ * @package Airtime
  * @subpackage StorageServer
  * @copyright 2010 Sourcefabric O.P.S.
  * @license http://www.gnu.org/licenses/gpl.txt
@@ -271,7 +271,7 @@ class SmilPlaylistAudioElement {
 
 
 /**
- * @package Campcaster
+ * @package Airtime
  * @subpackage StorageServer
  * @copyright 2010 Sourcefabric O.P.S.
  * @license http://www.gnu.org/licenses/gpl.txt

application/models/StoredFile.php

@@ -312,14 +312,14 @@ function camp_get_audio_metadata($p_filename, $p_testonly = false)
 /**
  *  StoredFile class
  *
- *  Campcaster file storage support class.<br>
+ *  Airtime file storage support class.<br>
  *  Represents one virtual file in storage. Virtual file has up to two parts:
  *  <ul>
  *      <li>metadata in database - represented by MetaData class</li>
  *      <li>binary media data in real file</li>
  *  </ul>
  *
- * @package Campcaster
+ * @package Airtime
  * @subpackage StorageServer
  * @copyright 2010 Sourcefabric O.P.S.
  * @license http://www.gnu.org/licenses/gpl.txt

application/models/Subjects.php

@@ -9,7 +9,7 @@ define('ALIBERR_BADSMEMB', 21);
  * with "linearized recursive membership" ;)
  *   (allow adding users to groups or groups to groups)
  *
- * @package Campcaster
+ * @package Airtime
  * @subpackage Alib
  * @copyright 2010 Sourcefabric O.P.S.
  * @license http://www.gnu.org/licenses/gpl.txt

application/models/Transport.php

@@ -38,7 +38,7 @@ include_once("TransportRecord.php");
  *   <li>file</li>
  *  </ul>
  *
- * @package Campcaster
+ * @package Airtime
  * @subpackage StorageServer
  * @copyright 2010 Sourcefabric O.P.S.
  * @license http://www.gnu.org/licenses/gpl.txt
@@ -401,7 +401,7 @@ class Transport
 
     /* ------------------------------------------------ remote-search methods */
     /**
-     * Start search job on remote Campcaster instance.
+     * Start search job on remote Airtime instance.
      *
      * @param array $criteria
      * 		LS criteria format (see localSearch)
@@ -1636,7 +1636,7 @@ class Transport
 
 
     /**
-     * Ping to remote Campcaster server
+     * Ping to remote Airtime server
      *
      * @return string
      * 		network hub response or error object

application/models/TransportRecord.php

@@ -5,7 +5,7 @@ define('TR_LEAVE_CLOSED', TRUE);
 /**
  * Auxiliary class for transport records
  *
- * @package Campcaster
+ * @package Airtime
  * @subpackage StorageServer
  * @copyright 2010 Sourcefabric O.P.S.
  * @license http://www.gnu.org/licenses/gpl.txt

application/models/Validator.php

@@ -23,7 +23,7 @@ define('VAL_PREDXML', 121);
  *  </ul>
  *  It probably should be replaced by XML schema validation in the future.
  *
- * @package Campcaster
+ * @package Airtime
  * @subpackage StorageServer
  * @copyright 2010 Sourcefabric O.P.S.
  * @license http://www.gnu.org/licenses/gpl.txt

application/models/XmlParser.php

@@ -1,6 +1,6 @@
 <?php
 /**
- * @package Campcaster
+ * @package Airtime
  * @subpackage StorageServer
  */
 require_once "XML/Util.php";
@@ -10,7 +10,7 @@ require_once "XML/Util.php";
 /**
  * Object representation of one XML element
  *
- * @package Campcaster
+ * @package Airtime
  * @subpackage StorageServer
  * @copyright 2010 Sourcefabric O.P.S.
  * @license http://www.gnu.org/licenses/gpl.txt
@@ -80,7 +80,7 @@ class XmlElement {
 /**
  * Object representation of one XML attribute
  *
- * @package Campcaster
+ * @package Airtime
  * @subpackage StorageServer
  * @copyright 2010 Sourcefabric O.P.S.
  * @license http://www.gnu.org/licenses/gpl.txt
@@ -126,7 +126,7 @@ class XmlAttrib {
 /**
  *  XML parser object encapsulation
  *
- * @package Campcaster
+ * @package Airtime
  * @subpackage StorageServer
  * @copyright 2010 Sourcefabric O.P.S.
  * @license http://www.gnu.org/licenses/gpl.txt

application/models/cron/Cron.php

@@ -18,7 +18,7 @@ require_once (dirname(__FILE__).'/../../conf.php');
  *    );
  *    $cron->closeCrontab();
  * </pre>
- * @package Campcaster
+ * @package Airtime
  * @subpackage StorageServer.Cron
  */
 class Cron {

application/models/cron/CronJob.php

@@ -2,7 +2,7 @@
 /**
  * Cron jobs handling abstract class
  *
- * @package Campcaster
+ * @package Airtime
  * @subpackage StorageServer.Cron
  */
 class CronJob

application/models/cron/Crontab.php

@@ -11,7 +11,7 @@ define('CRON_EMPTY',   4);
  * This class lets you manipulate a user's crontab.
  * It lets you add delete update entries easily.
  *
- * @package Campcaster
+ * @package Airtime
  * @subpackage StorageServer.Cron
  */
 class Crontab

application/models/playlistFormat.php

@@ -1,6 +1,6 @@
 <?php
 /**
- * @package Campcaster
+ * @package Airtime
  * @subpackage StorageServer
  * @copyright 2010 Sourcefabric O.P.S.
  * @license http://www.gnu.org/licenses/gpl.txt

application/models/tests/pdoTest.php

@@ -1,8 +1,11 @@
 <?php
 require_once(__DIR__.'/../../3rd_party/php/propel/runtime/lib/Propel.php');
 // Initialize Propel with the runtime configuration
-Propel::init(__DIR__."/../propel-db/build/conf/campcaster-conf.php");
+
-// Add the generated 'classes' directory to the include path
+//Example how to use PDO:
+//Propel::init(__DIR__."/../propel-db/build/conf/airtime-conf.php");
+
+//Add the generated 'classes' directory to the include path
 set_include_path(__DIR__."/../propel-db/build/classes" . PATH_SEPARATOR . get_include_path());
 $con = Propel::getConnection("campcaster");
 

application/models/xmlrpc/XR_LocStor.php

@@ -4,7 +4,7 @@ require_once(dirname(__FILE__).'/../LocStor.php');
 /**
  * XML-RPC interface for LocStor class
  *
- * @package Campcaster
+ * @package Airtime
  * @subpackage StorageServer
  * @copyright 2010 Sourcefabric O.P.S.
  * @license http://www.gnu.org/licenses/gpl.txt
@@ -12,7 +12,7 @@ require_once(dirname(__FILE__).'/../LocStor.php');
 class XR_LocStor extends LocStor {
     /* ----------------------------------------------------------- getVersion */
     /**
-     * Dummy method - only returns Campcaster version
+     * Dummy method - only returns Airtime version
      *
      * The XML-RPC name of this method is "locstor.getVersion".
      *
@@ -242,7 +242,7 @@ class XR_LocStor extends LocStor {
      *          (returned by subsequent storeAudioClipClose call)
      *      </li>
      *      <li> metadata  : string -  metadata XML string
-     *          (as defined in Campcaster::Core::AudioClip Class Reference,
+     *          (as defined in Airtime::Core::AudioClip Class Reference,
      *          examples are in storageServer/var/tests/*.xml)
      *      </li>
      *      <li> fname :  string - human readable mnemonic file name

application/models/xmlrpc/put.php

@@ -23,7 +23,7 @@
  *  </ul>
  *
  *  @see XR_LocStor
- * @package Campcaster
+ * @package Airtime
  * @subpackage storageServer
  */
 

application/models/xmlrpc/xrLocStor.php

@@ -61,7 +61,7 @@ $locStor = new XR_LocStor();
 $methods = array(
     'test'                    => 'Tests toupper and checks sessid, params: '.
                                   'teststring, sessid.',
-    'getVersion'              => 'Get version of Campcaster.',
+    'getVersion'              => 'Get version of Airtime.',
 //    'authenticate'            => 'Checks authentication.',
     'login'                   => 'Login to storage.',
     'logout'                  => 'Logout from storage.',

build/build.properties

@@ -1,9 +1,9 @@
-project.home = /home/naomiaro/dev-campcaster/campcaster
+project.home = /path/to/airtime
 project.build = ${project.home}/build
 
 #Database driver
 propel.database = pgsql
-propel.database.url = pgsql:host=localhost dbname=campcaster user=campcaster password=campcaster
+propel.database.url = pgsql:host=localhost dbname=airtime user=airtime password=airtime
 
 #Project name
 propel.project = campcaster

debian/rules

@@ -139,7 +139,7 @@ override_dh_install:
 override_dh_fixperms:
 	dh_fixperms
 	#
-	chmod +x debian/campcaster-data/usr/share/campcaster/www/storageServer/var/install/campcaster-user.php
+	chmod +x debian/campcaster-data/usr/share/campcaster/www/storageServer/var/install/airtime-user.php
 	chmod -x debian/campcaster-data/usr/share/campcaster/www/storageServer/var/cron/Crontab.php \
 		 debian/campcaster-data/usr/share/campcaster/www/storageServer/var/cron/CronJob.php \
 		 debian/campcaster-data/usr/share/campcaster/www/htmlUI/var/templates/popup/PLAYLIST.downloadExportedFile.tpl \

docs/README.txt

@@ -14,13 +14,13 @@ Setting Up Your VHOST
 The following is a sample VHOST you might want to consider for your project.
 
 <VirtualHost *:80>
-   DocumentRoot "/home/naomiaro/campcaster-refactor/campcaster/public"
+   DocumentRoot "/home/naomiaro/campcaster-refactor/airtime/public"
-   ServerName campcaster.local
+   ServerName airtime.local
 
    # This should be omitted in the production environment
    SetEnv APPLICATION_ENV development
     
-   <Directory "/home/naomiaro/campcaster-refactor/campcaster/public">
+   <Directory "/home/naomiaro/campcaster-refactor/airtime/public">
        Options Indexes MultiViews FollowSymLinks
        AllowOverride All
        Order allow,deny

install/airtime-user.php

@@ -17,9 +17,9 @@ if (isset($arr["DOCUMENT_ROOT"]) && ($arr["DOCUMENT_ROOT"] != "") ) {
 function printUsage()
 {
     echo "\n";
-    echo "campcaster-user\n";
+    echo "airtime-user\n";
     echo "===============\n";
-    echo "    This program allows you to manage Campcaster users.\n";
+    echo "    This program allows you to manage Airtime users.\n";
     echo "\n";
     echo "OPTIONS:\n";
     echo "    --addupdate <username> <password>\n";

install/postInstallStation.sh

@@ -1,23 +1,23 @@
 #!/bin/bash
 #-------------------------------------------------------------------------------
-#   Copyright (c) 2010 Sourcefabric O.P.S.
+#   Copyright (c) 2010 Airtime O.P.S.
 #
-#   This file is part of the Campcaster project.
+#   This file is part of the Airtime project.
 #   http://campcaster.sourcefabric.org/
 #   To report bugs, send an e-mail to bugs@campware.org
 #
-#   Campcaster is free software; you can redistribute it and/or modify
+#   Airtime is free software; you can redistribute it and/or modify
 #   it under the terms of the GNU General Public License as published by
 #   the Free Software Foundation; either version 2 of the License, or
 #   (at your option) any later version.
 #
-#   Campcaster is distributed in the hope that it will be useful,
+#   Airtime is distributed in the hope that it will be useful,
 #   but WITHOUT ANY WARRANTY; without even the implied warranty of
 #   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 #   GNU General Public License for more details.
 #
 #   You should have received a copy of the GNU General Public License
-#   along with Campcaster; if not, write to the Free Software
+#   along with Airtime; if not, write to the Free Software
 #   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 #
 #-------------------------------------------------------------------------------
@@ -404,7 +404,7 @@ if [ "$storage_is_local" = "yes" ]; then
     grep -q 'ls_scheduler_storage_pass' $install_etc/campcaster-scheduler.xml
     if [ $? = 0 ]; then
         SCHEDULER_STORAGE_PASS=`pwgen -N1 -c -n -s`
-        php -q $install_var_ls/storageServer/var/install/campcaster-user.php \
+        php -q $install_var_ls/storageServer/var/install/airtime-user.php \
             --addupdate scheduler ${SCHEDULER_STORAGE_PASS}
         sed -i -e "s/ls_scheduler_storage_pass/${SCHEDULER_STORAGE_PASS}/" \
             $install_etc/campcaster-scheduler.xml

install/propel-install.php

@@ -1,6 +1,6 @@
 <?php
 /**
- * @package Campcaster
+ * @package Airtime
  * @subpackage StorageServer
  * @copyright 2010 Sourcefabric O.P.S.
  * @license http://www.gnu.org/licenses/gpl.txt
@@ -15,7 +15,6 @@ if (isset($arr["DOCUMENT_ROOT"]) && ($arr["DOCUMENT_ROOT"] != "") ) {
     exit(1);
 }
 
-echo "******************************* Install Begin ********************************\n";
 
 require_once(dirname(__FILE__).'/../application/configs/conf.php');
 require_once(dirname(__FILE__).'/../application/models/GreenBox.php');
@@ -23,6 +22,12 @@ require_once(dirname(__FILE__).'/../application/models/GreenBox.php');
 require_once(dirname(__FILE__)."/installInit.php");
 
 // Need to check that we are superuser before running this.
+if(exec("whoami") != "root"){
+  echo "Must be root user.\n";
+  exit(1);
+}
+
+echo "******************************* Install Begin ********************************\n";
 
 echo " *** Database Installation ***\n";
 
@@ -201,7 +206,7 @@ install_setDirPermissions($CC_CONFIG["storageDir"]);
 //echo "   Done.\n";
 
 echo " * Importing sample audio clips \n";
-$command = __DIR__."/../utils/campcaster-import --copy ../audio_samples/ > /dev/null";
+$command = __DIR__."/../utils/airtime-import --copy ../audio_samples/ > /dev/null";
 @exec($command, $output, $results);
 echo "****************************** Install Complete ******************************\n";
 

install/uninstall.php

@@ -1,6 +1,6 @@
 <?php
 /**
- * @package Campcaster
+ * @package Airtime
  * @copyright 2010 Sourcefabric O.P.S.
  * @license http://www.gnu.org/licenses/gpl.txt
  */

library/getid3/bin/autogen.sh

@@ -2,21 +2,21 @@
 #-------------------------------------------------------------------------------
 #   Copyright (c) 2010 Sourcefabric O.P.S.
 #
-#   This file is part of the Campcaster project.
+#   This file is part of the Airtime project.
 #   http://campcaster.sourcefabric.org/
 #
-#   Campcaster is free software; you can redistribute it and/or modify
+#   Airtime is free software; you can redistribute it and/or modify
 #   it under the terms of the GNU General Public License as published by
 #   the Free Software Foundation; either version 2 of the License, or
 #   (at your option) any later version.
 #
-#   Campcaster is distributed in the hope that it will be useful,
+#   Airtime is distributed in the hope that it will be useful,
 #   but WITHOUT ANY WARRANTY; without even the implied warranty of
 #   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 #   GNU General Public License for more details.
 #
 #   You should have received a copy of the GNU General Public License
-#   along with Campcaster; if not, write to the Free Software
+#   along with Airtime; if not, write to the Free Software
 #   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 #
 #-------------------------------------------------------------------------------

library/getid3/configure

@@ -2,21 +2,21 @@
 #-------------------------------------------------------------------------------
 #   Copyright (c) 2010 Sourcefabric O.P.S.
 #
-#   This file is part of the Campcaster project.
+#   This file is part of the Airtime project.
-#   http://campcaster.campware.org/
+#   http://campcaster.sourcefabric.org/
 #
-#   Campcaster is free software; you can redistribute it and/or modify
+#   Airtime is free software; you can redistribute it and/or modify
 #   it under the terms of the GNU General Public License as published by
 #   the Free Software Foundation; either version 2 of the License, or
 #   (at your option) any later version.
 #
-#   Campcaster is distributed in the hope that it will be useful,
+#   Airtime is distributed in the hope that it will be useful,
 #   but WITHOUT ANY WARRANTY; without even the implied warranty of
 #   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 #   GNU General Public License for more details.
 #
 #   You should have received a copy of the GNU General Public License
-#   along with Campcaster; if not, write to the Free Software
+#   along with Airtime; if not, write to the Free Software
 #   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 #
 #-------------------------------------------------------------------------------

library/getid3/etc/Makefile.in

@@ -2,21 +2,21 @@
 #   getID3 - read and writes tags in media files - see getid3.readme.txt
 #   getID3 by James Heinrich <getid3@users.sourceforge.net>
 #
-#   This file is part of the Campcaster project.
+#   This file is part of the Airtime project.
 #   Copyright (c) 2010 Sourcefabric O.P.S.
 #
-#   Campcaster is free software; you can redistribute it and/or modify
+#   Airtime is free software; you can redistribute it and/or modify
 #   it under the terms of the GNU General Public License as published by
 #   the Free Software Foundation; either version 2 of the License, or
 #   (at your option) any later version.
 #
-#   Campcaster is distributed in the hope that it will be useful,
+#   Airtime is distributed in the hope that it will be useful,
 #   but WITHOUT ANY WARRANTY; without even the implied warranty of
 #   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 #   GNU General Public License for more details.
 #
 #   You should have received a copy of the GNU General Public License
-#   along with Campcaster; if not, write to the Free Software
+#   along with Airtime; if not, write to the Free Software
 #   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 #
 #   @configure_input@

library/getid3/etc/configure.ac

@@ -1,21 +1,21 @@
 dnl-----------------------------------------------------------------------------
 dnl Copyright (c) 2010 Sourcefabric O.P.S.
 dnl
-dnl This file is part of the Campcaster project.
+dnl This file is part of the Airtime project.
 dnl http://campcaster.sourcefabric.org/
 dnl
-dnl Campcaster is free software; you can redistribute it and/or modify
+dnl Airtime is free software; you can redistribute it and/or modify
 dnl it under the terms of the GNU General Public License as published by
 dnl the Free Software Foundation; either version 2 of the License, or
 dnl (at your option) any later version.
 dnl
-dnl Campcaster is distributed in the hope that it will be useful,
+dnl Airtime is distributed in the hope that it will be useful,
 dnl but WITHOUT ANY WARRANTY; without even the implied warranty of
 dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 dnl GNU General Public License for more details.
 dnl
 dnl You should have received a copy of the GNU General Public License
-dnl along with Campcaster; if not, write to the Free Software
+dnl along with Airtime; if not, write to the Free Software
 dnl Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 dnl
 dnl-----------------------------------------------------------------------------

library/getid3/etc/doxygen.config

@@ -2,20 +2,20 @@
 #   doxygen.config
 #   Copyright (c) 2010 Sourcefabric O.P.S.
 #
-#   This file is part of the Campcaster project.
+#   This file is part of the Airtime project.
 #
-#   Campcaster is free software; you can redistribute it and/or modify
+#   Airtime is free software; you can redistribute it and/or modify
 #   it under the terms of the GNU General Public License as published by
 #   the Free Software Foundation; either version 2 of the License, or
 #   (at your option) any later version.
 #
-#   Campcaster is distributed in the hope that it will be useful,
+#   Airtime is distributed in the hope that it will be useful,
 #   but WITHOUT ANY WARRANTY; without even the implied warranty of
 #   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 #   GNU General Public License for more details.
 #
 #   You should have received a copy of the GNU General Public License
-#   along with Campcaster; if not, write to the Free Software
+#   along with Airtime; if not, write to the Free Software
 #   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 #
 #-------------------------------------------------------------------------------

public/js/playlist/playlist.js

@@ -145,7 +145,7 @@
         }
 
         function getScheduleFromServer(){
-            $.ajax({ url: "http://localhost/Schedule/get-current-playlist/format/json", dataType:"json", success:function(data){
+            $.ajax({ url: "/Schedule/get-current-playlist/format/json", dataType:"json", success:function(data){
                     parseItems(data.entries);
                   }});
             setTimeout(getScheduleFromServer, 5000);

pypo/api_clients/api_client.py

@@ -20,8 +20,8 @@ from urlparse import urlparse
 
 
 def api_client_factory(config):
-	if config["api_client"] == "campcaster":	
+	if config["api_client"] == "airtime":	
-		return CampcasterApiClient(config)
+		return AirTimeApiClient(config)
 	elif config["api_client"] == "obp":
 		return ObpApiClient(config)
 	else:
@@ -100,15 +100,15 @@ class ApiClientInterface:
 	#	nil
 
 ################################################################################
-# Campcaster API Client
+# Airtime API Client
 ################################################################################
 
-class CampcasterApiClient(ApiClientInterface):
+class AirTimeApiClient(ApiClientInterface):
 
 	def __init__(self, config):
 		self.config = config
 
-	def __get_campcaster_version(self, verbose = True):
+	def __get_airtime_version(self, verbose = True):
 		logger = logging.getLogger()
 		url = self.config["base_url"] + self.config["api_base"] + self.config["version_url"]
 		url = url.replace("%%api_key%%", self.config["api_key"])
@@ -120,7 +120,7 @@ class CampcasterApiClient(ApiClientInterface):
 			logger.debug("Data: %s", data)
 			response_json = json.read(data)
 			version = response_json['version']
-			logger.debug("Campcaster Version %s detected", version)    
+			logger.debug("Airtime Version %s detected", version)    
 		except Exception, e:
 			try:
 				if e[1] == 401:
@@ -137,7 +137,7 @@ class CampcasterApiClient(ApiClientInterface):
 				if e[1] == 404:
 					if (verbose):
 						print '#####################################'
-						print '# Unable to contact the Campcaster-API'
+						print '# Unable to contact the Airtime-API'
 						print '# ' + url
 						print '#####################################'
 					return False
@@ -145,7 +145,7 @@ class CampcasterApiClient(ApiClientInterface):
 				pass
 
 			version = 0
-			logger.error("Unable to detect Campcaster Version - %s, Response: %s", e, response)
+			logger.error("Unable to detect Airtime Version - %s, Response: %s", e, response)
 
 		return version
 
@@ -168,22 +168,22 @@ class CampcasterApiClient(ApiClientInterface):
 
 
 	def is_server_compatible(self, verbose = True):
-		version = self.__get_campcaster_version(verbose)
+		version = self.__get_airtime_version(verbose)
 		if (version == 0 or version == False):
 			if (verbose):
-				print 'Unable to get Campcaster version number.'
+				print 'Unable to get Airtime version number.'
 				print
 			return False     
 		elif (version[0:4] != "1.6."): 
 			if (verbose):
-				print 'Campcaster version: ' + str(version)
+				print 'Airtime version: ' + str(version)
-				print 'pypo not compatible with this version of Campcaster.'
+				print 'pypo not compatible with this version of Airtime.'
 				print
 			return False     
 		else:
 			if (verbose):
-				print 'Campcaster version: ' + str(version)
+				print 'Airtime version: ' + str(version)
-				print 'pypo is compatible with this version of Campcaster.'
+				print 'pypo is compatible with this version of Airtime.'
 				print
 			return True
 

pypo/api_clients/api_client_factory.py

@@ -1,9 +1,9 @@
-import campcaster_api_client
+import airtime_api_client
 import obp_api_client
 
 def create_api_client(config):
-    if config["api_client"] == "campcaster":	
+    if config["api_client"] == "airtime":	
-        return campcaster_api_client.CampcasterApiClient(config)
+        return campcaster_api_client.AirtimeApiClient(config)
     elif config["api_client"] == "obp":
         return obp_api_client.ObpApiClient(config)
 		

pypo/config.cfg

@@ -5,9 +5,9 @@
 # Set the type of client you are using.
 # Currently supported types:
 # 1) "obp" = Open Broadcast Platform
-# 2) "campcaster"
+# 2) "airtime"
 #
-api_client = "campcaster"
+api_client = "airtime"
 
 ############################################
 # Directories / Hosts                      #
@@ -66,7 +66,7 @@ cue_style = 'pre'
 ################################################################################
 
 #####################
-# Campcaster Config #
+# Airtime Config #
 #####################
 # Value needed to access the API
 api_key = 'AAA'

utils/CleanStor.sh

@@ -2,25 +2,25 @@
 #-------------------------------------------------------------------------------
 #   Copyright (c) 2010 Sourcefabric O.P.S.
 #
-#   This file is part of the Campcaster project.
+#   This file is part of the Airtime project.
 #   http://campcaster.sourcefabric.org/
 #
-#   Campcaster is free software; you can redistribute it and/or modify
+#   Airtime is free software; you can redistribute it and/or modify
 #   it under the terms of the GNU General Public License as published by
 #   the Free Software Foundation; either version 2 of the License, or
 #   (at your option) any later version.
 #
-#   Campcaster is distributed in the hope that it will be useful,
+#   Airtime is distributed in the hope that it will be useful,
 #   but WITHOUT ANY WARRANTY; without even the implied warranty of
 #   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 #   GNU General Public License for more details.
 #
 #   You should have received a copy of the GNU General Public License
-#   along with Campcaster; if not, write to the Free Software
+#   along with Airtime; if not, write to the Free Software
 #   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 #
 #-------------------------------------------------------------------------------
 #-------------------------------------------------------------------------------
-#  This script cleans audio files in the Campcaster storageServer.
+#  This script cleans audio files in the Airtime storageServer.
 
 php -q CleanStor.php  "$@" || exit 1

utils/airtime-backup

@@ -2,26 +2,26 @@
 #-------------------------------------------------------------------------------
 #   Copyright (c) 2010 Sourcefabric O.P.S.
 #
-#   This file is part of the Campcaster project.
+#   This file is part of the Airtime project.
 #   http://campcaster.sourcefabric.org/
 #
-#   Campcaster is free software; you can redistribute it and/or modify
+#   Airtime is free software; you can redistribute it and/or modify
 #   it under the terms of the GNU General Public License as published by
 #   the Free Software Foundation; either version 2 of the License, or
 #   (at your option) any later version.
 #
-#   Campcaster is distributed in the hope that it will be useful,
+#   Airtime is distributed in the hope that it will be useful,
 #   but WITHOUT ANY WARRANTY; without even the implied warranty of
 #   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 #   GNU General Public License for more details.
 #
 #   You should have received a copy of the GNU General Public License
-#   along with Campcaster; if not, write to the Free Software
+#   along with Airtime; if not, write to the Free Software
 #   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 #
 #-------------------------------------------------------------------------------
 #-------------------------------------------------------------------------------
-#  This script creates a tgz archive of the Campcaster storage.
+#  This script creates a tgz archive of the Airtime storage.
 #
 #  To get usage help, try the -h option
 #-------------------------------------------------------------------------------
@@ -44,7 +44,7 @@ destfile="storage$datestr.tar"
 #-------------------------------------------------------------------------------
 printUsage()
 {
-    echo "This script creates a tgz archive of the Campcaster storage.";
+    echo "This script creates a tgz archive of the Airtime storage.";
     echo "parameters:";
     echo "";
     echo "  -d, --destination   Destination directory [default:$tmpmaindir].";
@@ -91,7 +91,7 @@ tmpdir=`mktemp -d $tmpmaindir/tmp.XXXXXX`
 echo "Backuping to $destdir/$destfile :"
 echo "Dumping database  ..."
 cd $phpdir
-php -q campcaster_backup.php > $tmpdir/$dbxml
+php -q airtime_backup.php > $tmpdir/$dbxml
 echo "Packaging stored files ..."
 cd $phpdir
 storpath=`php -q getStorPath.php`

utils/airtime-import

@@ -2,26 +2,26 @@
 #-------------------------------------------------------------------------------
 #   Copyright (c) 2010 Sourcefabric O.P.S.
 #
-#   This file is part of the Campcaster project.
+#   This file is part of the Airtime project.
 #   http://campcaster.sourcefabric.org/
 #
-#   Campcaster is free software; you can redistribute it and/or modify
+#   Airtime is free software; you can redistribute it and/or modify
 #   it under the terms of the GNU General Public License as published by
 #   the Free Software Foundation; either version 2 of the License, or
 #   (at your option) any later version.
 #
-#   Campcaster is distributed in the hope that it will be useful,
+#   Airtime is distributed in the hope that it will be useful,
 #   but WITHOUT ANY WARRANTY; without even the implied warranty of
 #   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 #   GNU General Public License for more details.
 #
 #   You should have received a copy of the GNU General Public License
-#   along with Campcaster; if not, write to the Free Software
+#   along with Airtime; if not, write to the Free Software
 #   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 #
 #-------------------------------------------------------------------------------
 #-------------------------------------------------------------------------------
-#  This script imports audio files to the Campcaster storageServer.
+#  This script imports audio files to the Airtime storageServer.
 #
 #  To get usage help, try the -h option
 #-------------------------------------------------------------------------------
@@ -40,4 +40,4 @@ invokePwd=$PWD
 #echo $invokePwd
 cd $phpdir
 
-php -q campcaster-import.php --dir "$invokePwd" "$@" || exit 1
+php -q airtime-import.php --dir "$invokePwd" "$@" || exit 1

utils/airtime-import.php

@@ -2,7 +2,7 @@
 /**
  * Mass import of audio files.
  *
- * @package Campcaster
+ * @package Airtime
  * @subpackage StorageAdmin
  * @copyright 2010 Sourcefabric O.P.S.
  * @license http://www.gnu.org/licenses/gpl.txt
@@ -27,7 +27,7 @@ function camp_import_error_handler()
 function printUsage()
 {
     global $CC_CONFIG;
-    echo "There are two ways to import audio files into Campcaster: linking\n";
+    echo "There are two ways to import audio files into Airtime: linking\n";
     echo "or copying.\n";
     echo "\n";
     echo "Linking has the advantage that it will not duplicate any files,\n";
@@ -40,13 +40,13 @@ function printUsage()
     echo "your files.\n";
     echo "\n";
     echo "Usage:\n";
-    echo "  campcaster-import [OPTIONS] FILES_OR_DIRS\n";
+    echo "  airtime-import [OPTIONS] FILES_OR_DIRS\n";
     echo "\n";
     echo "Options:\n";
     echo "  -l, --link     Link to specified files.\n";
     echo "                 Saves storage space, but you cannot move, delete,\n";
     echo "                 or rename the original files, otherwise there will\n";
-    echo "                 be dead air when Campcaster tries to play the file.\n";
+    echo "                 be dead air when Airtime tries to play the file.\n";
     echo "\n";
     echo "  -c, --copy     Copy the specified files.\n";
     echo "                 This is useful if you are importing from removable media.\n";
@@ -228,7 +228,7 @@ function camp_import_audio_file($p_filepath, $p_importMode = null, $p_testOnly =
 $DEBUG_IMPORT = false;
 
 echo "========================\n";
-echo "Campcaster Import Script\n";
+echo "Airtime Import Script\n";
 echo "========================\n";
 $g_errors = 0;
 //print_r($argv);
@@ -238,11 +238,11 @@ if ($DEBUG_IMPORT) {
     $testonly = false;
     $importMode = "link";
     $files = array("/path/to/your/test/file.mp3");
-    $dsn =  array('username' => 'campcaster',
+    $dsn =  array('username' => 'airtime',
-                  'password' => 'campcaster',
+                  'password' => 'airtime',
                   'hostspec' => 'localhost',
                   'phptype' => 'pgsql',
-                  'database' => 'campcaster');
+                  'database' => 'airtime');
 } else {
     $dsn = $CC_CONFIG['dsn'];
 }

utils/airtime-restore

@@ -2,26 +2,26 @@
 #-------------------------------------------------------------------------------
 #   Copyright (c) 2010 Sourcefabric O.P.S.
 #
-#   This file is part of the Campcaster project.
+#   This file is part of the Airtime project.
 #   http://campcaster.sourcefabric.org/
 #
-#   Campcaster is free software; you can redistribute it and/or modify
+#   Airtime is free software; you can redistribute it and/or modify
 #   it under the terms of the GNU General Public License as published by
 #   the Free Software Foundation; either version 2 of the License, or
 #   (at your option) any later version.
 #
-#   Campcaster is distributed in the hope that it will be useful,
+#   Airtime is distributed in the hope that it will be useful,
 #   but WITHOUT ANY WARRANTY; without even the implied warranty of
 #   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 #   GNU General Public License for more details.
 #
 #   You should have received a copy of the GNU General Public License
-#   along with Campcaster; if not, write to the Free Software
+#   along with Airtime; if not, write to the Free Software
 #   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 #
 #-------------------------------------------------------------------------------                                                                                
 #-------------------------------------------------------------------------------
-#  This script restores the data which was backed up with campcaster-backup.
+#  This script restores the data which was backed up with airtime-backup.
 #
 #  To get usage help, try the -h option
 #-------------------------------------------------------------------------------
@@ -42,7 +42,7 @@ tarfile0="xmls.tar"
 #-------------------------------------------------------------------------------
 printUsage()
 {
-    echo "This script restores the data which was backed up with campcaster-backup."
+    echo "This script restores the data which was backed up with airtime-backup."
     echo "parameters:";
     echo "";
     echo "  -f, --file          File with the backed up data, required.";

utils/resetStorage.sh

@@ -2,22 +2,22 @@
 #-------------------------------------------------------------------------------
 #   Copyright (c) 2010 Sourcefabric O.P.S.
 #
-#   This file is part of the Campcaster project.
+#   This file is part of the Airtime project.
 #   http://campcaster.sourcefabric.org/
 #   To report bugs, send an e-mail to bugs@campware.org
 #
-#   Campcaster is free software; you can redistribute it and/or modify
+#   Airtime is free software; you can redistribute it and/or modify
 #   it under the terms of the GNU General Public License as published by
 #   the Free Software Foundation; either version 2 of the License, or
 #   (at your option) any later version.
 #
-#   Campcaster is distributed in the hope that it will be useful,
+#   Airtime is distributed in the hope that it will be useful,
 #   but WITHOUT ANY WARRANTY; without even the implied warranty of
 #   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 #   GNU General Public License for more details.
 #
 #   You should have received a copy of the GNU General Public License
-#   along with Campcaster; if not, write to the Free Software
+#   along with Airtime; if not, write to the Free Software
 #   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 #
 #-------------------------------------------------------------------------------

utils/serbianLatinToCyrillicConverter.py

@@ -3,22 +3,22 @@
 #-------------------------------------------------------------------------------
 #   Copyright (c) 2010 Sourcefabric O.P.S.
 #
-#   This file is part of the Campcaster project.
+#   This file is part of the Airtime project.
 #   http://campcaster.sourcefabric.org/
 #   To report bugs, send an e-mail to bugs@campware.org
 #
-#   Campcaster is free software; you can redistribute it and/or modify
+#   Airtime is free software; you can redistribute it and/or modify
 #   it under the terms of the GNU General Public License as published by
 #   the Free Software Foundation; either version 2 of the License, or
 #   (at your option) any later version.
 #
-#   Campcaster is distributed in the hope that it will be useful,
+#   Airtime is distributed in the hope that it will be useful,
 #   but WITHOUT ANY WARRANTY; without even the implied warranty of
 #   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 #   GNU General Public License for more details.
 #
 #   You should have received a copy of the GNU General Public License
-#   along with Campcaster; if not, write to the Free Software
+#   along with Airtime; if not, write to the Free Software
 #   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 #
 #