Merge branch 'saas' into cc-5709-airtime-analyzer-cloud-storage-saas

Conflicts:
	.gitignore
	airtime_mvc/application/configs/airtime-conf.php
	airtime_mvc/application/configs/classmap-airtime-conf.php
	airtime_mvc/application/models/RabbitMq.php
	airtime_mvc/application/models/Schedule.php
	airtime_mvc/application/models/StoredFile.php
	airtime_mvc/application/models/airtime/map/CcShowInstancesTableMap.php
	airtime_mvc/application/models/airtime/map/CcShowTableMap.php
	airtime_mvc/application/models/airtime/om/BaseCcShow.php
	airtime_mvc/application/models/airtime/om/BaseCcShowInstances.php
	airtime_mvc/application/models/airtime/om/BaseCcShowInstancesPeer.php
	airtime_mvc/application/models/airtime/om/BaseCcShowInstancesQuery.php
	airtime_mvc/application/models/airtime/om/BaseCcShowPeer.php
	airtime_mvc/application/models/airtime/om/BaseCcShowQuery.php
	airtime_mvc/application/modules/rest/Bootstrap.php
	airtime_mvc/application/modules/rest/controllers/MediaController.php
	airtime_mvc/build/sql/schema.sql
	airtime_mvc/public/index.php

airtime_mvc/application/configs/ACL.php

@@ -7,13 +7,15 @@ $ccAcl = new Zend_Acl();
 $ccAcl->addRole(new Zend_Acl_Role('G'))
       ->addRole(new Zend_Acl_Role('H'), 'G')
       ->addRole(new Zend_Acl_Role('P'), 'H')
-      ->addRole(new Zend_Acl_Role('A'), 'P');
+      ->addRole(new Zend_Acl_Role('A'), 'P')
+      ->addRole(new Zend_Acl_Role('S'), 'A');
 
 $ccAcl->add(new Zend_Acl_Resource('library'))
       ->add(new Zend_Acl_Resource('index'))
       ->add(new Zend_Acl_Resource('user'))
       ->add(new Zend_Acl_Resource('error'))
       ->add(new Zend_Acl_Resource('login'))
+      ->add(new Zend_Acl_Resource('whmcs-login'))
       ->add(new Zend_Acl_Resource('playlist'))
       ->add(new Zend_Acl_Resource('plupload'))
       ->add(new Zend_Acl_Resource('schedule'))
@@ -29,11 +31,13 @@ $ccAcl->add(new Zend_Acl_Resource('library'))
       ->add(new Zend_Acl_Resource('audiopreview'))
       ->add(new Zend_Acl_Resource('webstream'))
       ->add(new Zend_Acl_Resource('locale'))
-      ->add(new Zend_Acl_Resource('upgrade'));
+      ->add(new Zend_Acl_Resource('upgrade'))
+      ->add(new Zend_Acl_Resource('billing'));
 
 /** Creating permissions */
 $ccAcl->allow('G', 'index')
       ->allow('G', 'login')
+      ->allow('G', 'whmcs-login')
       ->allow('G', 'error')
       ->allow('G', 'user', 'edit-user')
       ->allow('G', 'showbuilder')
@@ -54,7 +58,8 @@ $ccAcl->allow('G', 'index')
       ->allow('A', 'listenerstat')
       ->allow('A', 'user')
       ->allow('A', 'systemstatus')
-      ->allow('A', 'preference');
+      ->allow('A', 'preference')
+      ->allow('S', 'billing');
       
 
 $aclPlugin = new Zend_Controller_Plugin_Acl($ccAcl);

airtime_mvc/application/configs/application.ini

@@ -8,6 +8,7 @@ resources.frontController.controllerDirectory = APPLICATION_PATH "/controllers"
 resources.frontController.params.displayExceptions = 0
 resources.frontController.moduleDirectory = APPLICATION_PATH "/modules"
 resources.frontController.plugins.putHandler = "Zend_Controller_Plugin_PutHandler"
+resources.modules[] = ""
 ;load everything in the modules directory including models
 resources.layout.layoutPath = APPLICATION_PATH "/layouts/scripts/"
 resources.modules[] = ""

airtime_mvc/application/configs/constants.php

@@ -41,6 +41,7 @@ define('UI_MDATA_VALUE_FORMAT_STREAM' , 'live stream');
 //User types
 define('UTYPE_HOST'            , 'H');
 define('UTYPE_ADMIN'           , 'A');
+define('UTYPE_SUPERADMIN'      , 'S');
 define('UTYPE_GUEST'           , 'G');
 define('UTYPE_PROGRAM_MANAGER' , 'P');
 
@@ -63,3 +64,9 @@ define('UI_BLOCK_SESSNAME', 'BLOCK');*/
 define('SOUNDCLOUD_NOT_UPLOADED_YET' , -1);
 define('SOUNDCLOUD_PROGRESS'         , -2);
 define('SOUNDCLOUD_ERROR'            , -3);
+
+
+//WHMCS integration
+define("WHMCS_API_URL", "https://account.sourcefabric.com/includes/api.php");
+define("SUBDOMAIN_WHMCS_CUSTOM_FIELD_NAME", "Choose your domain");
+

airtime_mvc/application/configs/navigation.php

@@ -134,6 +134,34 @@ $pages = array(
                 'resource'   =>    'dashboard'
             )
         )
+    ),
+    array(
+        'label' => _('Billing'),
+        'uri' => '#',
+        'resource' => 'billing',
+        'pages' => array(
+            array(
+                'label' => _('Account Details'),
+                'module' => 'default',
+                'controller' => 'billing',
+                'action' => 'client',
+                'resource' => 'billing'
+            ),
+            array(
+                'label' => _('Account Plans'),
+                'module' => 'default',
+                'controller' => 'billing',
+                'action' => 'upgrade',
+                'resource' => 'billing'
+            ),
+            array(
+                'label' => _('View Invoices'),
+                'module' => 'default',
+                'controller' => 'billing',
+                'action' => 'invoices',
+                'resource' => 'billing'
+            )
+        )
     )
 );