From a25c9a3e48bd4e69ea188b54afcab4e1de6a4f4d Mon Sep 17 00:00:00 2001
From: Mafoo <github@mafoo.org>
Date: Wed, 25 May 2016 21:12:17 +0100
Subject: [PATCH] Added basic searching for moh (#1614)

added basic searching for the default moh directory
added app_defaults so moh is configured/repairable with app_defaults
changed to use PROJECT_ROOT
changed template replacement to be encased in comment so xml will
validate
changed to use preg_replace so leading spaces and tabs can be stripped
(to output clean xml)
local_stream_conf dos2unixed
made default search consistent (they should all be music/default or
music not a mixture)
---
 app/music_on_hold/app_defaults.php            |  36 +++++++
 .../classes/switch_music_on_hold.php          |  14 ++-
 .../autoload_configs/local_stream.conf.xml    | 100 +++++++++---------
 3 files changed, 96 insertions(+), 54 deletions(-)
 create mode 100644 app/music_on_hold/app_defaults.php

diff --git a/app/music_on_hold/app_defaults.php b/app/music_on_hold/app_defaults.php
new file mode 100644
index 0000000000..563befa8d2
--- /dev/null
+++ b/app/music_on_hold/app_defaults.php
@@ -0,0 +1,36 @@
+<?php
+/*
+	FusionPBX
+	Version: MPL 1.1
+
+	The contents of this file are subject to the Mozilla Public License Version
+	1.1 (the "License"); you may not use this file except in compliance with
+	the License. You may obtain a copy of the License at
+	http://www.mozilla.org/MPL/
+
+	Software distributed under the License is distributed on an "AS IS" basis,
+	WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+	for the specific language governing rights and limitations under the
+	License.
+
+	The Original Code is FusionPBX
+
+	The Initial Developer of the Original Code is
+	Mark J Crane <markjcrane@fusionpbx.com>
+	Portions created by the Initial Developer are Copyright (C) 2016
+	the Initial Developer. All Rights Reserved.
+
+	Contributor(s):
+	Mark J Crane <markjcrane@fusionpbx.com>
+	Matthew Vale <github@mafoo.org>
+*/
+
+	if ($domains_processed == 1) {
+
+		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/app/music_on_hold/resources/classes/switch_music_on_hold.php b/app/music_on_hold/resources/classes/switch_music_on_hold.php
index 41f8f920bc..268695905a 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
@@ -184,11 +184,16 @@ include "root.php";
 					$file_contents = file_get_contents("/usr/share/examples/fusionpbx/resources/templates/conf/autoload_configs/local_stream.conf.xml");
 				}
 				else {
-					$file_contents = file_get_contents($_SERVER["DOCUMENT_ROOT"].PROJECT_PATH."/resources/templates/conf/autoload_configs/local_stream.conf.xml");
+					$file_contents = file_get_contents($_SERVER["PROJECT_ROOT"]."/resources/templates/conf/autoload_configs/local_stream.conf.xml");
 				}
-
-			//replace the variable
-				$file_contents = str_replace("{v_moh_categories}", $this->xml, $file_contents);
+			//check where the default music is stored
+				$default_moh_prefix = 'music/default';
+				if(file_exists($_SESSION['switch']['sounds']['dir'].'/music/8000')) {
+					$default_moh_prefix = 'music';
+				}
+			//replace the variables
+				$file_contents = preg_replace("music\/default", $default_moh_prefix, $file_contents);
+				$file_contents = preg_replace("[\t ]*(?:<!--)?{v_moh_categories}(?:-->)?", $this->xml, $file_contents);
 
 			//write the XML config file
 				$fout = fopen($_SESSION['switch']['conf']['dir']."/autoload_configs/local_stream.conf.xml","w");
@@ -198,6 +203,7 @@ include "root.php";
 			//reload the XML
 				$this->reload();
 		}
+
 	}
 
 //build and save the XML
diff --git a/resources/templates/conf/autoload_configs/local_stream.conf.xml b/resources/templates/conf/autoload_configs/local_stream.conf.xml
index 8be463fff1..a646d85966 100644
--- a/resources/templates/conf/autoload_configs/local_stream.conf.xml
+++ b/resources/templates/conf/autoload_configs/local_stream.conf.xml
@@ -1,50 +1,50 @@
-<configuration name="local_stream.conf" description="stream files from local dir">
-	<!-- fallback to default if requested moh class isn't found -->
-	<directory name="default" path="$${sounds_dir}/music/default/8000">
-		<param name="rate" value="8000"/>
-		<param name="shuffle" value="true"/>
-		<param name="channels" value="1"/>
-		<param name="interval" value="20"/>
-		<param name="timer-name" value="soft"/>
-		<!-- list of short files to break in with every so often -->
-		<!--<param name="chime-list" value="file1.wav,file2.wav"/>-->
-		<!-- frequency of break-in (seconds)-->
-		<!--<param name="chime-freq" value="30"/>-->
-		<!-- limit to how many seconds the file will play -->
-		<!--<param name="chime-max" value="500"/>-->
-	</directory>
-
-	<directory name="moh/8000" path="$${sounds_dir}/music/8000">
-		<param name="rate" value="8000"/>
-		<param name="shuffle" value="true"/>
-		<param name="channels" value="1"/>
-		<param name="interval" value="20"/>
-		<param name="timer-name" value="soft"/>
-	</directory>
-
-	<directory name="moh/16000" path="$${sounds_dir}/music/16000">
-		<param name="rate" value="16000"/>
-		<param name="shuffle" value="true"/>
-		<param name="channels" value="1"/>
-		<param name="interval" value="20"/>
-		<param name="timer-name" value="soft"/>
-	</directory>
-
-	<directory name="moh/32000" path="$${sounds_dir}/music/32000">
-		<param name="rate" value="32000"/>
-		<param name="shuffle" value="true"/>
-		<param name="channels" value="1"/>
-		<param name="interval" value="20"/>
-		<param name="timer-name" value="soft"/>
-	</directory>
-
-	<directory name="moh/48000" path="$${sounds_dir}/music/48000">
-		<param name="rate" value="48000"/>
-		<param name="shuffle" value="true"/>
-		<param name="channels" value="1"/>
-		<param name="interval" value="10"/>
-		<param name="timer-name" value="soft"/>
-	</directory>
-
-	{v_moh_categories}
-</configuration>
+<configuration name="local_stream.conf" description="stream files from local dir">
+	<!-- fallback to default if requested moh class isn't found -->
+	<directory name="default" path="$${sounds_dir}/music/default/8000">
+		<param name="rate" value="8000"/>
+		<param name="shuffle" value="true"/>
+		<param name="channels" value="1"/>
+		<param name="interval" value="20"/>
+		<param name="timer-name" value="soft"/>
+		<!-- list of short files to break in with every so often -->
+		<!--<param name="chime-list" value="file1.wav,file2.wav"/>-->
+		<!-- frequency of break-in (seconds)-->
+		<!--<param name="chime-freq" value="30"/>-->
+		<!-- limit to how many seconds the file will play -->
+		<!--<param name="chime-max" value="500"/>-->
+	</directory>
+
+	<directory name="moh/8000" path="$${sounds_dir}/music/default/8000">
+		<param name="rate" value="8000"/>
+		<param name="shuffle" value="true"/>
+		<param name="channels" value="1"/>
+		<param name="interval" value="20"/>
+		<param name="timer-name" value="soft"/>
+	</directory>
+
+	<directory name="moh/16000" path="$${sounds_dir}/music/default/16000">
+		<param name="rate" value="16000"/>
+		<param name="shuffle" value="true"/>
+		<param name="channels" value="1"/>
+		<param name="interval" value="20"/>
+		<param name="timer-name" value="soft"/>
+	</directory>
+
+	<directory name="moh/32000" path="$${sounds_dir}/music/default/32000">
+		<param name="rate" value="32000"/>
+		<param name="shuffle" value="true"/>
+		<param name="channels" value="1"/>
+		<param name="interval" value="20"/>
+		<param name="timer-name" value="soft"/>
+	</directory>
+
+	<directory name="moh/48000" path="$${sounds_dir}/music/default/48000">
+		<param name="rate" value="48000"/>
+		<param name="shuffle" value="true"/>
+		<param name="channels" value="1"/>
+		<param name="interval" value="10"/>
+		<param name="timer-name" value="soft"/>
+	</directory>
+
+	<!--{v_moh_categories}-->
+</configuration>