From 51960a891f5ff100ee8711843d9e0579047531da Mon Sep 17 00:00:00 2001
From: Lucas Bickel <hairmare@rabe.ch>
Date: Thu, 2 Mar 2017 14:40:29 +0100
Subject: [PATCH] Manual loading fix for more classes in Zend_ pseudo-ns

---
 airtime_mvc/application/forms/AddShowLiveStream.php       | 2 ++
 airtime_mvc/application/forms/AddShowStyle.php            | 2 ++
 airtime_mvc/application/forms/RegisterAirtime.php         | 2 ++
 airtime_mvc/application/forms/SoundCloudPreferences.php   | 2 ++
 airtime_mvc/application/forms/TuneInPreferences.php       | 2 ++
 airtime_mvc/application/forms/customfilters/ImageSize.php | 4 ++--
 .../forms/customvalidators/ConditionalNotEmpty.php        | 8 +++++++-
 7 files changed, 19 insertions(+), 3 deletions(-)

diff --git a/airtime_mvc/application/forms/AddShowLiveStream.php b/airtime_mvc/application/forms/AddShowLiveStream.php
index dd532f986..cd2b7be15 100644
--- a/airtime_mvc/application/forms/AddShowLiveStream.php
+++ b/airtime_mvc/application/forms/AddShowLiveStream.php
@@ -1,5 +1,7 @@
 <?php
 
+require_once 'customvalidators/ConditionalNotEmpty.php';
+
 class Application_Form_AddShowLiveStream extends Zend_Form_SubForm
 {
 
diff --git a/airtime_mvc/application/forms/AddShowStyle.php b/airtime_mvc/application/forms/AddShowStyle.php
index acfc38db9..0448df055 100644
--- a/airtime_mvc/application/forms/AddShowStyle.php
+++ b/airtime_mvc/application/forms/AddShowStyle.php
@@ -1,5 +1,7 @@
 <?php
 
+require_once 'customfilters/ImageSize.php';
+
 class Application_Form_AddShowStyle extends Zend_Form_SubForm
 {
 
diff --git a/airtime_mvc/application/forms/RegisterAirtime.php b/airtime_mvc/application/forms/RegisterAirtime.php
index 479310d68..f242c38fa 100644
--- a/airtime_mvc/application/forms/RegisterAirtime.php
+++ b/airtime_mvc/application/forms/RegisterAirtime.php
@@ -1,5 +1,7 @@
 <?php
 
+require_once 'customfilters/ImageSize.php';
+
 class Application_Form_RegisterAirtime extends Zend_Form
 {
 
diff --git a/airtime_mvc/application/forms/SoundCloudPreferences.php b/airtime_mvc/application/forms/SoundCloudPreferences.php
index 4b22ea2a2..dd2a7b603 100644
--- a/airtime_mvc/application/forms/SoundCloudPreferences.php
+++ b/airtime_mvc/application/forms/SoundCloudPreferences.php
@@ -1,5 +1,7 @@
 <?php
 
+require_once 'customvalidators/ConditionalNotEmpty.php';
+
 class Application_Form_SoundcloudPreferences extends Zend_Form_SubForm
 {
 
diff --git a/airtime_mvc/application/forms/TuneInPreferences.php b/airtime_mvc/application/forms/TuneInPreferences.php
index bb905df86..3e7c2a660 100644
--- a/airtime_mvc/application/forms/TuneInPreferences.php
+++ b/airtime_mvc/application/forms/TuneInPreferences.php
@@ -1,5 +1,7 @@
 <?php
 
+require_once 'customvalidators/ConditionalNotEmpty.php';
+
 class Application_Form_TuneInPreferences extends Zend_Form_SubForm
 {
     public function init()
diff --git a/airtime_mvc/application/forms/customfilters/ImageSize.php b/airtime_mvc/application/forms/customfilters/ImageSize.php
index 498354c2e..299121d20 100644
--- a/airtime_mvc/application/forms/customfilters/ImageSize.php
+++ b/airtime_mvc/application/forms/customfilters/ImageSize.php
@@ -6,8 +6,8 @@
  * way zf1 Zend_Loader_PluginLoader expects it to be found. Another way around this
  * might be to rename the class and have the new name get loaded proper.
  *
- * Since this is only getting used on the GeneralPreferences form I am re-adding the
- * require_once over there to get this fixed for now.
+ * Since this is only getting used in a few places I am re-adding the
+ * require_once there to get this fixed for now.
  */
 
 class Zend_Filter_ImageSize implements Zend_Filter_Interface
diff --git a/airtime_mvc/application/forms/customvalidators/ConditionalNotEmpty.php b/airtime_mvc/application/forms/customvalidators/ConditionalNotEmpty.php
index d0d1992fc..c99c66e9d 100644
--- a/airtime_mvc/application/forms/customvalidators/ConditionalNotEmpty.php
+++ b/airtime_mvc/application/forms/customvalidators/ConditionalNotEmpty.php
@@ -1,7 +1,13 @@
 <?php
-
 /**
  * Check if a field is empty but only when specific fields have specific values
+ *
+ * WARNING: you need to include this file directly when using it, it clashes with the 
+ * way zf1 Zend_Loader_PluginLoader expects it to be found. Another way around this
+ * might be to rename the class and have the new name get loaded proper.
+ *
+ * Since this is only getting used in a few places I am re-adding the
+ * require_once there to get this fixed for now.
  */
 class ConditionalNotEmpty extends Zend_Validate_Abstract
 {