Changeset 6560

Timestamp:

09/04/08 12:38:47 (3 months ago)

Author:

p_lindheimer

Message:

ref #3156 added optional format= line that is sometimes required for streaming applications

Files:

• modules/branches/2.5/music/page.music.php (modified) (4 diffs)

modules/branches/2.5/music/page.music.php

@@ -44 +44 @@
-        case "editednewstream":
-                $stream = isset($_REQUEST['stream'])?$_REQUEST['stream']:'';
+                $format = isset($_REQUEST['format'])?trim($_REQUEST['format']):'';
+                if ($format != "") {
+                        $stream .= "\nformat=$format";
+                }
-                makestreamcatergory($path_to_dir,$stream);
-                createmusicconf();
@@ -326 +330 @@
-        </tr>
-        <tr>
+        <tr>
+                <td><a href="#" class="info"><?php echo _("Optional Format:")?><span><?php echo _("Optional value for \"format=\" line used to provide the format to Asterisk. This should be a format understood by Asterisk such as ulaw, and is specific to the streaming application you are using. See information on musiconhold.conf configuration for different audio and internet streaming source options.")?> </span></a></td>
+                <td><input type="text" name="format" size="6" value=""></td>
+        </tr>
+        <tr>
-                <td colspan="2"><br><h6><input name="Submit" type="submit" value='<?php echo _("Submit Changes")?>' ></h6></td>         
-        </tr>
@@ -365 +374 @@
-        if (file_exists("{$path_to_dir}/.custom")) {
-                $application = file_get_contents("{$path_to_dir}/.custom");
+                $application = explode("\n",$application);
+                if (isset($application[1])) {
+                        $format = explode('=',$application[1],2);
+                        $format = $format[1];
+                } else {
+                        $format = "";
+                }
-        } else {
-                $application = false;
@@ -385 +401 @@
-                <tr>
-                        <td><a href="#" class="info"><?php echo _("Application:")?><span><?php echo _("This is the \"application=\" line used to provide the streaming details to Asterisk. See information on musiconhold.conf configuration for different audio and internet streaming source options.")?> </span></a></td>
-
+
+
+
+
+
-                </tr>
-                <tr>