From 01f34c02103f23063437635b4866063a9ad4ceea Mon Sep 17 00:00:00 2001
From: Mark Crane <markjcrane@gmail.com>
Date: Wed, 24 Dec 2014 06:36:09 +0000
Subject: [PATCH] Update the example code to set MOH. Add the auto_loader class
 only if it is not defined.

---
 .../classes/switch_music_on_hold.php          | 10 ++--
 resources/require.php                         | 46 ++++++++++---------
 2 files changed, 29 insertions(+), 27 deletions(-)

diff --git a/app/music_on_hold/resources/classes/switch_music_on_hold.php b/app/music_on_hold/resources/classes/switch_music_on_hold.php
index 6a7a0dcab7..bad55ea041 100644
--- a/app/music_on_hold/resources/classes/switch_music_on_hold.php
+++ b/app/music_on_hold/resources/classes/switch_music_on_hold.php
@@ -201,10 +201,10 @@ include "root.php";
 		}
 	}
 
-//require_once "app/music_on_hold/resources/classes/switch_music_on_hold.php";
-//$moh= new switch_music_on_hold;
-//$moh->select_name = "hold_music";
-//$moh->select_value = $hold_music;
-//echo $moh->select();
+//build and save the XML
+	//require_once "app/music_on_hold/resources/classes/switch_music_on_hold.php";
+	//$moh = new switch_music_on_hold;
+	//$moh->xml();
+	//$moh->save();
 
 ?>
\ No newline at end of file
diff --git a/resources/require.php b/resources/require.php
index 002f1e83b5..be94978bdc 100644
--- a/resources/require.php
+++ b/resources/require.php
@@ -42,29 +42,31 @@
 	}
 
 //class auto loader
-	class auto_loader {
-		public function __construct() {
-			spl_autoload_register(array($this, 'loader'));
-		}
-		private function loader($class_name) {
-			//use glob to check "/resources/classes", "/{core,app}/*/resources/classes";
-				if (defined("GLOB_BRACE")) {
-					$results = glob($_SERVER["DOCUMENT_ROOT"] . PROJECT_PATH . "{/*/*,}/resources/classes/".$class_name.".php", GLOB_BRACE);
-				}
-				else {
-					$array_1 = glob($_SERVER["DOCUMENT_ROOT"] . PROJECT_PATH . "/*/*/resources/classes/".$class_name.".php");
-					$array_2 = glob($_SERVER["DOCUMENT_ROOT"] . PROJECT_PATH . "/resources/classes/".$class_name.".php");
-					$results = array_merge((array)$array_1,(array)$array_2);
-					unset($array_1, $array_2);
-				}
-
-			//include the class
-				foreach ($results as &$class_file) {
-					if (!class_exists($class_name)) {
-						include $class_file;
+	if (!class_exists(auto_loader)) {
+		class auto_loader {
+			public function __construct() {
+				spl_autoload_register(array($this, 'loader'));
+			}
+			private function loader($class_name) {
+				//use glob to check "/resources/classes", "/{core,app}/*/resources/classes";
+					if (defined("GLOB_BRACE")) {
+						$results = glob($_SERVER["DOCUMENT_ROOT"] . PROJECT_PATH . "{/*/*,}/resources/classes/".$class_name.".php", GLOB_BRACE);
 					}
-				}
-				unset($results);
+					else {
+						$array_1 = glob($_SERVER["DOCUMENT_ROOT"] . PROJECT_PATH . "/*/*/resources/classes/".$class_name.".php");
+						$array_2 = glob($_SERVER["DOCUMENT_ROOT"] . PROJECT_PATH . "/resources/classes/".$class_name.".php");
+						$results = array_merge((array)$array_1,(array)$array_2);
+						unset($array_1, $array_2);
+					}
+
+				//include the class
+					foreach ($results as &$class_file) {
+						if (!class_exists($class_name)) {
+							include $class_file;
+						}
+					}
+					unset($results);
+			}
 		}
 	}
 	$autoload = new auto_loader();