-changed some references from campcaster to airtime in the documentation / comments

application/controllers/LibraryController.php

@@ -26,7 +26,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');
 	
@@ -120,7 +120,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

@@ -25,7 +25,7 @@ class SearchController extends Zend_Controller_Action
     {
 		$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');
 
@@ -36,7 +36,7 @@ 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->_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
@@ -905,7 +905,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
@@ -1015,7 +1015,7 @@ class PlaylistTagExport
 
 
 /**
- * @package Campcaster
+ * @package Airtime
  * @subpackage StorageServer
  * @copyright 2010 Sourcefabric O.P.S.
  * @license http://www.gnu.org/licenses/gpl.txt
@@ -1196,7 +1196,7 @@ class PlaylistElementExport {
 
 
 /**
- * @package Campcaster
+ * @package Airtime
  * @subpackage StorageServer
  * @copyright 2010 Sourcefabric O.P.S.
  * @license http://www.gnu.org/licenses/gpl.txt
@@ -1270,7 +1270,7 @@ class PlaylistAudioClipExport
 
 
 /**
- * @package Campcaster
+ * @package Airtime
  * @subpackage StorageServer
  * @copyright 2010 Sourcefabric O.P.S.
  * @license http://www.gnu.org/licenses/gpl.txt
@@ -1304,7 +1304,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.',