Changeset 13466

Timestamp:

02/17/12 16:05:52 (1 year ago)

Author:

p_lindheimer

Message:

fixes #5337 made music_conf class so retrieve_conf now generates new musiconhold_additional.conf still generated based on present structure of moh directory but require retrieve_conf to generate it meaning when Advanced Settings are changed, it will generate a new file based on the new path

Files:

• modules/branches/2.10/music/functions.inc.php (modified) (1 diff)
• modules/branches/2.10/music/page.music.php (modified) (5 diffs)

modules/branches/2.10/music/functions.inc.php

@@ -2 +2 @@
-if (!defined('FREEPBX_IS_AUTH')) { die('No direct script access allowed'); }
-
+class music_conf {
+
+  // return the filename to write
+  function get_filename() {
+    return "musiconhold_additional.conf";
+  }
+  // return the output that goes in the file
+  function generateConf() {
+    global $amp_conf;
+    $path_to_moh_dir = $amp_conf['ASTVARLIBDIR'].'/'.$amp_conf['MOHDIR'];
+    $output = "";
+
+    $File_Write="";
+    $tresults = music_list();
+    if (isset($tresults)) {
+      foreach ($tresults as $tresult)  {
+        // hack - but his is all a hack until redone, in functions, etc.
+        // this puts a none category to allow no music to be chosen
+        //
+        if ($tresult == "none") {
+          $dir = $path_to_moh_dir."/.nomusic_reserved";
+          if (!is_dir($dir)) {
+            music_makemusiccategory($dir);
+          }
+          touch($dir."/silence.wav");
+        } elseif ($tresult != "default" ) {
+          $dir = $path_to_moh_dir."/{$tresult}/";
+        } else {
+          $dir = $path_to_moh_dir.'/';
+        }
+        if (file_exists("{$dir}.custom")) {
+          $application = file_get_contents("{$dir}.custom");
+          $File_Write.="[{$tresult}]\nmode=custom\napplication=$application\n";
+        } else if (file_exists("{$dir}.random")) {
+          $File_Write.="[{$tresult}]\nmode=files\ndirectory={$dir}\nrandom=yes\n";
+        } else {
+          $File_Write.="[{$tresult}]\nmode=files\ndirectory={$dir}\n";
+        }
+      }
+    }
+    return $File_Write;
+  }
+}
+
+function music_makemusiccategory($path_to_dir) {
+  mkdir("$path_to_dir", 0755); 
+}
+ 
-function music_list($path=null) {
-  if ($path === null) {

modules/branches/2.10/music/page.music.php

@@ -40 +40 @@
-if (strlen($randon)) {
-  touch($path_to_dir."/.random");
-  createmusicconf();
-  needreload();
-}
-if (strlen($randoff)) {
-  unlink($path_to_dir."/.random");
-  createmusicconf();
-  needreload();
-}
@@ -57 +55 @@
-    }
-    makestreamcatergory($path_to_dir,$stream);
-    createmusicconf();
-    needreload();
-    redirect_standard();
-  case "addednew":
-
-
+
-    needreload();
-    redirect_standard();
-  break;
-  case "addedfile":
-    createmusicconf();
-    needreload();
-//    redirect_standard();
@@ -77 +72 @@
-    $path_to_dir = $path_to_moh_dir;
-    $category='default';
-    createmusicconf();
-    needreload();
-    redirect_standard();
@@ -105 +99 @@
-
-<?php
-function createmusicconf() {
-  global $amp_conf;
-  global $path_to_moh_dir;
-
-  $File_Write="";
-  $tresults = music_list();
-  if (isset($tresults)) {
-    foreach ($tresults as $tresult)  {
-      // hack - but his is all a hack until redone, in functions, etc.
-      // this puts a none category to allow no music to be chosen
-      //
-      if ($tresult == "none") {
-        $dir = $path_to_moh_dir."/.nomusic_reserved";
-        if (!is_dir($dir)) {
-          makemusiccategory($dir);
-        }
-        touch($dir."/silence.wav");
-      } elseif ($tresult != "default" ) {
-        $dir = $path_to_moh_dir."/{$tresult}/";
-      } else {
-        $dir = $path_to_moh_dir.'/';
-      }
-      if (file_exists("{$dir}.custom")) {
-        $application = file_get_contents("{$dir}.custom");
-        $File_Write.="[{$tresult}]\nmode=custom\napplication=$application\n";
-      } else if (file_exists("{$dir}.random")) {
-        $File_Write.="[{$tresult}]\nmode=files\ndirectory={$dir}\nrandom=yes\n";
-      } else {
-        $File_Write.="[{$tresult}]\nmode=files\ndirectory={$dir}\n";
-      }
-    }
-  }
-
-
-  $handle = fopen($amp_conf['ASTETCDIR']."/musiconhold_additional.conf", "w");
-
-  if (fwrite($handle, $File_Write) === FALSE) {
-    echo _("Cannot write to file")." ($tmpfname)";
-    exit;
-  }
-
-  fclose($handle);
-}
-
-function makestreamcatergory($path_to_dir,$stream) {
-  if (!is_dir($path_to_dir)) {
-
+usic_m
-  }
-  $fh=fopen("$path_to_dir/.custom","w");
@@ -158 +108 @@
-}
-
-function makemusiccategory($path_to_dir) {
-  mkdir("$path_to_dir", 0755); 
-}
- 
-function build_list() {
-  global $path_to_dir;