From 58b4576ae1975dbd26c5ba1be9a8eee74aaa38c6 Mon Sep 17 00:00:00 2001
From: Martin Konecny <martin@localhost.localdomain>
Date: Mon, 6 Feb 2012 14:18:03 -0500
Subject: [PATCH] CC-3297: Depend on zendframework and php-pear as external
 packages

-DB dependency should now be externalized
---
 airtime_mvc/application/models/tests/AllTests.php           | 1 -
 install_full/ubuntu/airtime-full-install                    | 2 +-
 install_full/ubuntu/airtime-full-install-nginx              | 2 +-
 install_minimal/include/AirtimeInstall.php                  | 4 +---
 install_minimal/include/airtime-upgrade.php                 | 3 ---
 install_minimal/upgrades/airtime-1.9.0/airtime-upgrade.php  | 1 -
 install_minimal/upgrades/airtime-2.0.0/UpgradeCommon.php    | 1 -
 install_minimal/upgrades/upgrade-template/UpgradeCommon.php | 1 -
 python_apps/pypo/test/airtime-schedule-insert.php           | 3 ---
 utils/phone_home_stat.php                                   | 2 --
 utils/soundcloud-uploader.php                               | 2 --
 11 files changed, 3 insertions(+), 19 deletions(-)

diff --git a/airtime_mvc/application/models/tests/AllTests.php b/airtime_mvc/application/models/tests/AllTests.php
index 7ff5a8d9f..2d5620935 100644
--- a/airtime_mvc/application/models/tests/AllTests.php
+++ b/airtime_mvc/application/models/tests/AllTests.php
@@ -1,5 +1,4 @@
 <?php
-$path = dirname(__FILE__).'/../../../library/pear';
 set_include_path(get_include_path() . PATH_SEPARATOR . $path);
 $WHITE_SCREEN_OF_DEATH = false;
 
diff --git a/install_full/ubuntu/airtime-full-install b/install_full/ubuntu/airtime-full-install
index a17fcced0..211ff24c6 100755
--- a/install_full/ubuntu/airtime-full-install
+++ b/install_full/ubuntu/airtime-full-install
@@ -39,7 +39,7 @@ php-pear php5-gd postgresql odbc-postgresql python2.6 libsoundtouch-ocaml \
 libtaglib-ocaml libao-ocaml libmad-ocaml ecasound \
 libesd0 libportaudio2 libsamplerate0 rabbitmq-server patch \
 php5-curl mpg123 monit python-virtualenv multitail libcamomile-ocaml-data \
-libvorbis-ocaml libpulse0 vorbis-tools lsb-release
+libvorbis-ocaml libpulse0 vorbis-tools lsb-release php-db zendframework
 
 #install packages with --force-yes option (this is useful in the case
 #of Debian, where these packages are unauthorized)
diff --git a/install_full/ubuntu/airtime-full-install-nginx b/install_full/ubuntu/airtime-full-install-nginx
index ea767f73c..3c129e350 100755
--- a/install_full/ubuntu/airtime-full-install-nginx
+++ b/install_full/ubuntu/airtime-full-install-nginx
@@ -42,7 +42,7 @@ php-pear php5-gd postgresql odbc-postgresql python2.6 libsoundtouch-ocaml \
 libtaglib-ocaml libao-ocaml libmad-ocaml ecasound \
 libesd0 libportaudio2 libsamplerate0 rabbitmq-server patch \
 php5-curl mpg123 monit python-virtualenv multitail libcamomile-ocaml-data \
-libvorbis-ocaml libpulse0 vorbis-tools lsb-release
+libvorbis-ocaml libpulse0 vorbis-tools lsb-release php-db zendframework
 
 #install packages with --force-yes option (this is useful in the case
 #of Debian, where these packages are unauthorized)
diff --git a/install_minimal/include/AirtimeInstall.php b/install_minimal/include/AirtimeInstall.php
index 9ba2c58fa..42c17619f 100644
--- a/install_minimal/include/AirtimeInstall.php
+++ b/install_minimal/include/AirtimeInstall.php
@@ -1,9 +1,7 @@
 <?php
 set_include_path(__DIR__.'/../../airtime_mvc/library' . PATH_SEPARATOR . get_include_path());
 require_once('Zend/Loader/Autoloader.php');
-//Pear classes.
-set_include_path(__DIR__.'/../../airtime_mvc/library/pear' . PATH_SEPARATOR . get_include_path());
-require_once('pear/DB.php');
+require_once('DB.php');
 
 class AirtimeInstall
 {
diff --git a/install_minimal/include/airtime-upgrade.php b/install_minimal/include/airtime-upgrade.php
index 9394d265e..18c7c7712 100644
--- a/install_minimal/include/airtime-upgrade.php
+++ b/install_minimal/include/airtime-upgrade.php
@@ -6,9 +6,6 @@
  * @license http://www.gnu.org/licenses/gpl.txt
  */
 
-//Pear classes.
-set_include_path(__DIR__.'/../../airtime_mvc/library/pear' . PATH_SEPARATOR . get_include_path());
-
 require_once('DB.php');
 require_once(__DIR__.'/airtime-constants.php');
 require_once(dirname(__FILE__).'/AirtimeIni.php');
diff --git a/install_minimal/upgrades/airtime-1.9.0/airtime-upgrade.php b/install_minimal/upgrades/airtime-1.9.0/airtime-upgrade.php
index 7dbc4aa86..eeca6f9f8 100644
--- a/install_minimal/upgrades/airtime-1.9.0/airtime-upgrade.php
+++ b/install_minimal/upgrades/airtime-1.9.0/airtime-upgrade.php
@@ -7,7 +7,6 @@
  */
 
 set_include_path(__DIR__.'/../../../airtime_mvc/library' . PATH_SEPARATOR . get_include_path());
-set_include_path(__DIR__.'/../../../airtime_mvc/library/pear' . PATH_SEPARATOR . get_include_path());
 require_once 'conf.php';
 require_once 'DB.php';
 
diff --git a/install_minimal/upgrades/airtime-2.0.0/UpgradeCommon.php b/install_minimal/upgrades/airtime-2.0.0/UpgradeCommon.php
index ee638adfa..a66bfd5df 100644
--- a/install_minimal/upgrades/airtime-2.0.0/UpgradeCommon.php
+++ b/install_minimal/upgrades/airtime-2.0.0/UpgradeCommon.php
@@ -1,6 +1,5 @@
 <?php
 
-set_include_path(__DIR__.'/../../airtime_mvc/library/pear' . PATH_SEPARATOR . get_include_path());
 require_once('DB.php');
 
 /* These are helper functions that are common to each upgrade such as
diff --git a/install_minimal/upgrades/upgrade-template/UpgradeCommon.php b/install_minimal/upgrades/upgrade-template/UpgradeCommon.php
index 8c55de9fa..ead2ba311 100644
--- a/install_minimal/upgrades/upgrade-template/UpgradeCommon.php
+++ b/install_minimal/upgrades/upgrade-template/UpgradeCommon.php
@@ -1,6 +1,5 @@
 <?php
 
-set_include_path(__DIR__.'/../../airtime_mvc/library/pear' . PATH_SEPARATOR . get_include_path());
 require_once('DB.php');
 
 /* These are helper functions that are common to each upgrade such as
diff --git a/python_apps/pypo/test/airtime-schedule-insert.php b/python_apps/pypo/test/airtime-schedule-insert.php
index 1d947225e..defb843b4 100644
--- a/python_apps/pypo/test/airtime-schedule-insert.php
+++ b/python_apps/pypo/test/airtime-schedule-insert.php
@@ -10,9 +10,6 @@ set_include_path(get_include_path() . PATH_SEPARATOR . realpath(APPLICATION_PATH
 set_include_path(get_include_path() . PATH_SEPARATOR . APPLICATION_PATH . '/models');
 echo get_include_path().PHP_EOL;
 
-//Pear classes.
-set_include_path(APPLICATION_PATH . get_include_path() . PATH_SEPARATOR . '/../library/pear');
-
 //Controller plugins.
 set_include_path(APPLICATION_PATH . get_include_path() . PATH_SEPARATOR . '/controllers/plugins');
 
diff --git a/utils/phone_home_stat.php b/utils/phone_home_stat.php
index fa6848bea..98bc242f5 100644
--- a/utils/phone_home_stat.php
+++ b/utils/phone_home_stat.php
@@ -38,8 +38,6 @@ require_once($CC_CONFIG['phpDir'].'/application/models/ShowInstance.php');
 require_once($CC_CONFIG['phpDir'].'/application/models/Preference.php');
 require_once($CC_CONFIG['phpDir'].'/application/models/StreamSetting.php');
 
-//Pear classes.
-set_include_path($CC_CONFIG['phpDir'].'/library/pear' . PATH_SEPARATOR . get_include_path());
 require_once('DB.php');
 $CC_DBC = DB::connect($CC_CONFIG['dsn'], FALSE);
 if (PEAR::isError($CC_DBC)) {
diff --git a/utils/soundcloud-uploader.php b/utils/soundcloud-uploader.php
index 2882dacf7..43b8e150a 100644
--- a/utils/soundcloud-uploader.php
+++ b/utils/soundcloud-uploader.php
@@ -35,8 +35,6 @@ set_include_path($CC_CONFIG['phpDir']."/application/models" . PATH_SEPARATOR . g
 require_once($CC_CONFIG['phpDir']."/library/propel/runtime/lib/Propel.php");
 Propel::init($CC_CONFIG['phpDir']."/application/configs/airtime-conf.php");
 
-//Pear classes.
-set_include_path($CC_CONFIG['phpDir'].'/library/pear' . PATH_SEPARATOR . get_include_path());
 require_once('DB.php');
 $CC_DBC = DB::connect($CC_CONFIG['dsn'], FALSE);
 if (PEAR::isError($CC_DBC)) {