summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlib <aliboba@free.fr>2010-02-26 15:40:44 +0100
committerAlib <aliboba@free.fr>2010-02-26 15:40:44 +0100
commitd26bb405c701b278ecf4b34b9b2d3012e90340ac (patch)
tree9d4ce589f4eff06cb6656e15a0ed3fa36f0c84d2
parent89dbb951e87914fa73a7bad65a5c7d4d9bef0131 (diff)
downloadistreamdev-d26bb405c701b278ecf4b34b9b2d3012e90340ac.tar.gz
istreamdev-d26bb405c701b278ecf4b34b9b2d3012e90340ac.tar.bz2
solved directory with ' in the name.
-rwxr-xr-xincludes/inc_video.php5
-rwxr-xr-xistream.sh1
2 files changed, 5 insertions, 1 deletions
diff --git a/includes/inc_video.php b/includes/inc_video.php
index 10a5714..cc12664 100755
--- a/includes/inc_video.php
+++ b/includes/inc_video.php
@@ -11,6 +11,7 @@ if ($subdir[strlen($subdir)-1] != '/')
print "<body onorientationchange=\"updateOrientation();\" onload=\"updateOrientation();\">\r\n";
print "<div id=\"topbar\" class=\"transparent\">\r\n";
+
print "<div id=\"leftnav\">\r\n";
if ($subdir == '/')
@@ -31,7 +32,9 @@ print " <br>";
print " <ul class=\"pageitem\">";
print " <li class=\"textbox\"><span class=\"header\">Current path:</span><p>{$subdir}</p></li>";
-$dir_handle = @opendir($mediapath .$subdir);
+$noslashdir = stripslashes($mediapath.$subdir);
+$dir_handle = @opendir($noslashdir);
+
if (!$dir_handle)
{
print "Unable to open $mediapath .$subdir";
diff --git a/istream.sh b/istream.sh
index 62d5230..ae32bb0 100755
--- a/istream.sh
+++ b/istream.sh
@@ -28,6 +28,7 @@ fi
if (! ps ax | awk '{print $5}' | grep -q "$SEGMENTERPATH")
then
+test -L ram && (test -d /dev/shm/ram || mkdir /dev/shm/ram)
cd ram
2> /dev/null rm "$PREFIX"*.ts