From 0921ec0f64d6782076d1e1fb2333cb53c86d279f Mon Sep 17 00:00:00 2001 From: Alib Date: Thu, 25 Feb 2010 13:39:11 +0100 Subject: trying to debug js array --- includes/inc_audio.php | 18 +++++++++++------- includes/inc_utils.php | 24 ++++++++++++++++++++++++ javascript/ajax.js | 8 ++++---- javascript/functions.js | 15 +++++++++++++++ 4 files changed, 54 insertions(+), 11 deletions(-) diff --git a/includes/inc_audio.php b/includes/inc_audio.php index df7e401..d8fd09d 100755 --- a/includes/inc_audio.php +++ b/includes/inc_audio.php @@ -37,7 +37,6 @@ if ($medianame_array[0]) sort($medianame_array); $count = count($medianame_array); - for ($cnt=0; $cnt < $count; $cnt++) { // Dirs @@ -63,7 +62,16 @@ if ($medianame_array[0]) if (mediagettype($mediapath .$subdir .$medianame_array[$cnt]) == 2) { print "
  • \r\n"; - print " \r\n"; + //print " \r\n"; + + for ($cnt2=$cnt; $cnt2<$count; $cnt2++) + { + $track[$cnt2] = $httppath."playlist/".$medianame_array[$cnt2]; + + } + $jsarray = php2js($track); + + print " \r\n"; print " $idx{$medianame_array[$cnt]}\r\n"; print " \r\n"; print "
  • \r\n"; @@ -74,11 +82,7 @@ if ($medianame_array[0]) print(""); - print "
    \r\n"; - print "\r\n"; + print "
    \r\n"; print("
    "); } diff --git a/includes/inc_utils.php b/includes/inc_utils.php index a984794..541c35b 100755 --- a/includes/inc_utils.php +++ b/includes/inc_utils.php @@ -24,4 +24,28 @@ function is_utf8($str) { } return true; } + +function php2js ($var) { + if (is_array($var)) { + $res = "["; + $array = array(); + foreach ($var as $a_var) { + $array[] = php2js($a_var); + } + return join(",", $array); + } + elseif (is_bool($var)) { + return $var ? "true" : "false"; + } + elseif (is_int($var) || is_integer($var) || is_double($var) || is_float($var)) { + return $var; + } + elseif (is_string($var)) { + return "\"" . addslashes(stripslashes($var)) . "\""; + } + // autres cas: objets, on ne les gère pas + return FALSE; +} + + ?> diff --git a/javascript/ajax.js b/javascript/ajax.js index 40ca661..56e7057 100755 --- a/javascript/ajax.js +++ b/javascript/ajax.js @@ -48,11 +48,11 @@ function openpls(xhr) var items = docXML.getElementsByTagName("m3u") streamstatus = items.item(0).firstChild.data; - if ( streamstatus == 'error' ) + if ( streamstatus == 'error' ) { this.location.href = 'error.php'; - else + } - this.location.href = 'playlist/playlist.m3u'; + //this.location.href = 'playlist/playlist.m3u'; //document.s1.Play(); - } + } } diff --git a/javascript/functions.js b/javascript/functions.js index a708963..39927e4 100755 --- a/javascript/functions.js +++ b/javascript/functions.js @@ -189,4 +189,19 @@ function checkform() } return true; + +} + +function addplayer(track) { + + + playercode= "