From 3c85aefafe5290ffa2cab8d56ddd69b15282dacf Mon Sep 17 00:00:00 2001
From: fgerlits <fgerlits@cfc7b370-4200-0410-a6e3-cb6bdb053afe>
Date: Sat, 4 Apr 2009 14:03:53 +0000
Subject: [PATCH] Merged [3352] and [3353] back from the 1.4 branch to the
 trunk. Did not merge [3354]; this fix is not necessary with the new libodbc++
 version.

---
 campcaster/src/modules/core/src/FileTools.cxx               | 2 +-
 campcaster/src/modules/core/src/LocalizedObject.cxx         | 4 ++--
 campcaster/src/modules/core/src/Uuid.cxx                    | 2 +-
 campcaster/src/modules/htmlUI/var/templates/menu.tpl        | 2 +-
 .../src/modules/htmlUI/var/templates/popup/testStream.tpl   | 6 +++---
 campcaster/src/modules/htmlUI/var/ui_browser.class.php      | 4 +++-
 6 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/campcaster/src/modules/core/src/FileTools.cxx b/campcaster/src/modules/core/src/FileTools.cxx
index 8f428c705..620e87566 100644
--- a/campcaster/src/modules/core/src/FileTools.cxx
+++ b/campcaster/src/modules/core/src/FileTools.cxx
@@ -93,7 +93,7 @@ FileTools :: copyUrlToFile(const std::string &      url,
     
     int    status =   curl_easy_setopt(handle, CURLOPT_URL, url.c_str()); 
     status |=   curl_easy_setopt(handle, CURLOPT_WRITEDATA, file);
-    status |=   curl_easy_setopt(handle, CURLOPT_HTTPGET);
+    status |=   curl_easy_setopt(handle, CURLOPT_HTTPGET, 1);
 
     if (status) {
         fclose(file);
diff --git a/campcaster/src/modules/core/src/LocalizedObject.cxx b/campcaster/src/modules/core/src/LocalizedObject.cxx
index 4c55721fc..45bcebf0f 100644
--- a/campcaster/src/modules/core/src/LocalizedObject.cxx
+++ b/campcaster/src/modules/core/src/LocalizedObject.cxx
@@ -34,7 +34,7 @@
 #endif
 
 #include <unicode/msgfmt.h>
-
+#include <string.h>
 #include "LiveSupport/Core/LocalizedObject.h"
 
 
@@ -322,7 +322,7 @@ LocalizedObject :: getBinaryResourceAsUstring(const char *      key)
                                         "binary resource");
         }
         char *                      strBuf = new char[length + 1];
-        std::memcpy(strBuf, data, length);
+        memcpy(strBuf, data, length);
         strBuf[length] = 0;
         Ptr<Glib::ustring>::Ref string(new Glib::ustring(strBuf));
         if (string->validate()) {
diff --git a/campcaster/src/modules/core/src/Uuid.cxx b/campcaster/src/modules/core/src/Uuid.cxx
index 18cda1a50..74c281aa1 100644
--- a/campcaster/src/modules/core/src/Uuid.cxx
+++ b/campcaster/src/modules/core/src/Uuid.cxx
@@ -49,7 +49,7 @@
 #include <cstdlib>
 #include <iomanip>
 #include <sstream>
-
+#include <string.h>
 #include "LiveSupport/Core/Uuid.h"
 
 
diff --git a/campcaster/src/modules/htmlUI/var/templates/menu.tpl b/campcaster/src/modules/htmlUI/var/templates/menu.tpl
index c049ca59d..d49b2254a 100644
--- a/campcaster/src/modules/htmlUI/var/templates/menu.tpl
+++ b/campcaster/src/modules/htmlUI/var/templates/menu.tpl
@@ -21,7 +21,7 @@ if (window.attachEvent) window.attachEvent("onload", sfHover);
         <li class="nav-main"><a href="{$UI_BROWSER}?folderId={$START.fid}&act=addFileData">##Add Audio##</a>
             <ul>
                 <li><a href="{$UI_BROWSER}?folderId={$START.fid}&act=addFileData">##Audioclip##</a></li>
-                {* <li><a href="{$UI_BROWSER}?folderId={$START.fid}&act=addWebstreamData">##Webstream##</a></li> *}
+                <li><a href="{$UI_BROWSER}?folderId={$START.fid}&act=addWebstreamData">##Webstream##</a></li>
             </ul>
         </li>
         <li class="nav-main"><a>##Media Library##</a>
diff --git a/campcaster/src/modules/htmlUI/var/templates/popup/testStream.tpl b/campcaster/src/modules/htmlUI/var/templates/popup/testStream.tpl
index 820692ce6..c3ba87c83 100644
--- a/campcaster/src/modules/htmlUI/var/templates/popup/testStream.tpl
+++ b/campcaster/src/modules/htmlUI/var/templates/popup/testStream.tpl
@@ -28,11 +28,11 @@
     </p>
     <br>
 
-    <div>
     {if $data.header}
-        Returned connection header:<pre>{$data.header}</pre>
+        ##Connection header:##
+        <br>
+        <textarea rows="6" cols="45" readonly>{$data.header}</textarea>
     {/if}
-    </div>
 
 {else}
      <div>{tra str='Connection to $1 port $2 $3' 1=$data.host 2=$data.port 3='<font color="red">failed</font>'}</div>
diff --git a/campcaster/src/modules/htmlUI/var/ui_browser.class.php b/campcaster/src/modules/htmlUI/var/ui_browser.class.php
index 702f3a426..c9eaef6e9 100644
--- a/campcaster/src/modules/htmlUI/var/ui_browser.class.php
+++ b/campcaster/src/modules/htmlUI/var/ui_browser.class.php
@@ -377,6 +377,8 @@ class uiBrowser extends uiBase {
      */
     function testStream($url)
     {
+        global $CC_CONFIG;
+        
         touch(UI_TESTSTREAM_MU3_TMP);
         $handle = fopen(UI_TESTSTREAM_MU3_TMP, "w");
         fwrite($handle, $url);
@@ -403,7 +405,7 @@ class uiBrowser extends uiBase {
                     $type = explode(':', $type);
 
                     foreach ($CC_CONFIG['stream_types'] as $t) {
-                        if (preg_match('/'.str_replace('/', '\/', $t).'/i', $type[1])) {
+                        if (stripos($type[1], $t) !== false) {
                             $match = TRUE;
                             break;
                         }