From 70bf3d6f1ca2b215adc32b50da604ecd1eb66b35 Mon Sep 17 00:00:00 2001
From: "paul.baranowski" <paul.baranowski@sourcefabric.org>
Date: Thu, 30 Sep 2010 17:09:50 -0400
Subject: [PATCH] CC-1695  	 Remove Campcaster Studio and make install
 easier Fixed include paths for install.

---
 backend/cron/Cron.php | 2 +-
 install/install.php   | 6 +++---
 install/uninstall.php | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/backend/cron/Cron.php b/backend/cron/Cron.php
index c9b940552..fba702b62 100755
--- a/backend/cron/Cron.php
+++ b/backend/cron/Cron.php
@@ -1,6 +1,6 @@
 <?php
 require_once (dirname(__FILE__).'/Crontab.php');
-require_once (dirname(__FILE__).'/../conf.php');
+require_once (dirname(__FILE__).'/../../conf.php');
 /**
  * This class can call a PHP function from crontab.
  * Example:
diff --git a/install/install.php b/install/install.php
index a627341c4..2323d5e38 100644
--- a/install/install.php
+++ b/install/install.php
@@ -22,6 +22,7 @@ echo "*************************\n";
 
 require_once(dirname(__FILE__).'/../conf.php');
 require_once(dirname(__FILE__).'/../backend/GreenBox.php');
+require_once(dirname(__FILE__).'/../backend/cron/Cron.php');
 require_once(dirname(__FILE__)."/installInit.php");
 campcaster_db_connect(true);
 
@@ -516,8 +517,8 @@ if (!camp_db_table_exists($CC_CONFIG['prefTable'])) {
     echo " * Inserting starting data into table ".$CC_CONFIG['prefTable']."...";
     $stPrefGr = Subjects::GetSubjId($CC_CONFIG['StationPrefsGr']);
     Prefs::Insert($CC_CONFIG["systemPrefId"], 'stationName', "Radio Station 1");
-    $genres = file_get_contents( dirname(__FILE__).'/../genres.xml');
-    Prefs::Insert($CC_CONFIG["systemPrefId"], 'genres', $genres);
+//    $genres = file_get_contents( dirname(__FILE__).'/../genres.xml');
+//    Prefs::Insert($CC_CONFIG["systemPrefId"], 'genres', $genres);
     echo "done.\n";
 } else {
     echo " * Skipping: database table already exists: ".$CC_CONFIG['prefTable']."\n";
@@ -566,7 +567,6 @@ echo "done.\n";
 //------------------------------------------------------------------------
 // Install Cron job
 //------------------------------------------------------------------------
-require_once(dirname(__FILE__).'/../cron/Cron.php');
 $m = '*/2';
 $h ='*';
 $dom = '*';
diff --git a/install/uninstall.php b/install/uninstall.php
index bc52a8a2a..3793a0371 100644
--- a/install/uninstall.php
+++ b/install/uninstall.php
@@ -22,6 +22,7 @@ echo "***************************\n";
 
 require_once(dirname(__FILE__).'/../conf.php');
 require_once(dirname(__FILE__).'/installInit.php');
+require_once(dirname(__FILE__).'/../backend/cron/Cron.php');
 campcaster_db_connect(false);
 
 function camp_uninstall_delete_files($p_path)
@@ -57,7 +58,6 @@ if (!PEAR::isError($CC_DBC)) {
 //------------------------------------------------------------------------
 // Uninstall Cron job
 //------------------------------------------------------------------------
-require_once(dirname(__FILE__).'/../cron/Cron.php');
 $old_regex = '/transportCron\.php/';
 echo " * Uninstall storageServer cron job...\n";