From 38f2290214ed5e4638e75035ab00dcabdbda9736 Mon Sep 17 00:00:00 2001
From: Martin Konecny <martin@martin-ThinkPad-T410.(none)>
Date: Thu, 13 Oct 2011 23:35:18 +0200
Subject: [PATCH] CC-2972: Find better way to determine domain which pypo
 should download from.

-remove basePort and baseUrl from code + config file, since it isn't used anywhere.
---
 airtime_mvc/application/configs/conf.php | 4 ++--
 airtime_mvc/build/airtime.conf           | 2 --
 utils/phone_home_stat.php                | 4 ++--
 3 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/airtime_mvc/application/configs/conf.php b/airtime_mvc/application/configs/conf.php
index 51899021a..10d54b01a 100644
--- a/airtime_mvc/application/configs/conf.php
+++ b/airtime_mvc/application/configs/conf.php
@@ -63,8 +63,8 @@ class Config {
         $CC_CONFIG['webServerUser'] = $values['general']['web_server_user'];
         $CC_CONFIG['rabbitmq'] = $values['rabbitmq'];
 
-        $CC_CONFIG['baseUrl'] = $values['general']['base_url'];
-        $CC_CONFIG['basePort'] = $values['general']['base_port'];
+        //$CC_CONFIG['baseUrl'] = $values['general']['base_url'];
+        //$CC_CONFIG['basePort'] = $values['general']['base_port'];
         
 	    // Database config
         $CC_CONFIG['dsn']['username'] = $values['database']['dbuser'];
diff --git a/airtime_mvc/build/airtime.conf b/airtime_mvc/build/airtime.conf
index b11e672ce..aa1ca2dde 100644
--- a/airtime_mvc/build/airtime.conf
+++ b/airtime_mvc/build/airtime.conf
@@ -15,8 +15,6 @@ vhost = /
 api_key = AAA
 web_server_user = www-data
 airtime_dir = x
-base_url = localhost
-base_port = 80
 
 [soundcloud]
 connection_retries = 3
diff --git a/utils/phone_home_stat.php b/utils/phone_home_stat.php
index 1a695645b..73f5b7cc6 100644
--- a/utils/phone_home_stat.php
+++ b/utils/phone_home_stat.php
@@ -6,8 +6,8 @@ $CC_CONFIG['webServerUser'] = $values['general']['web_server_user'];
 $CC_CONFIG['phpDir'] = $values['general']['airtime_dir'];
 $CC_CONFIG['rabbitmq'] = $values['rabbitmq'];
 
-$CC_CONFIG['baseUrl'] = $values['general']['base_url'];
-$CC_CONFIG['basePort'] = $values['general']['base_port'];
+//$CC_CONFIG['baseUrl'] = $values['general']['base_url'];
+//$CC_CONFIG['basePort'] = $values['general']['base_port'];
 
 // Database config
 $CC_CONFIG['dsn']['username'] = $values['database']['dbuser'];