diff --git a/html/lmbrowse.php b/html/lmbrowse.php index 29e9871..8660222 100644 --- a/html/lmbrowse.php +++ b/html/lmbrowse.php @@ -1,8 +1,8 @@ + echo " {$news_tab[$i]["alink"]} {$news_tab[$i]["alink"]} "; @@ -1874,6 +1874,15 @@ function lmb_track_info_get( $play_type, $play_id, $play_priority, $track_id) $replace_tab = array( "/mp3-192/", ".mp3"); $track_info["url"] = "/".str_replace( $search_tab, $replace_tab, "${track_file}"); + + if( file_exists( "{$play_path}/.hide" )) + { + $track_info["hide"] = "y"; + } + else + { + $track_info["hide"] = "n"; + } } return( $track_info); @@ -2044,7 +2053,14 @@ function lmb_tracklist_microdata( $play_type, $play_id, $play_priority) for( $i = 0; $i < $tracks_nb; $i++) { echo "
- + @@ -2294,7 +2310,7 @@ function lmb_coverlist( $play_type, $play_id, $play_priority, $skin_path) /* Video File Tab Get */ /*--------------------------------------------------------------------------------------------------------------------*/ -function lmb_video_file_tab_get( $play_type, $play_id, $play_priority, $video_id, $mode) +function lmb_video_file_tab_get( $play_type, $play_id, $play_priority, $video_id, $video_codec, $mode) { global $lmb_url_post; @@ -2302,7 +2318,7 @@ function lmb_video_file_tab_get( $play_type, $play_id, $play_priority, $video_id $play_path = lmb_play_path_get( $play_type, $play_id, $play_priority); $video_path = "{$play_path}/videos"; - $cmd = "ls {$video_path}/{$video_id}-*-*-*.avi | sed -e 's/.*{$play_id}-.*-//' -e 's/.avi$//' | sort -rn"; + $cmd = "ls {$video_path}/{$video_id}* | sed -e 's/.*-//' -e 's/\..*$//' | grep -v icon | grep -v poster | sort -rnu"; exec( $cmd, $video_format_tab); $file_tab = array(); @@ -2310,7 +2326,8 @@ function lmb_video_file_tab_get( $play_type, $play_id, $play_priority, $video_id for( $i = 0; $i < count($video_format_tab); $i++) { $video_format = "{$video_format_tab[$i]}"; - $file_url = "{$video_path}/{$video_id}-*-{$video_format}.avi"; + $file_url = "{$video_path}/{$video_id}-{$video_format}.{$video_codec}"; + if( count( glob( "{$file_url}"))) { @@ -2323,9 +2340,56 @@ function lmb_video_file_tab_get( $play_type, $play_id, $play_priority, $video_id } else { - $tab = glob( "{$file_url}"); - $file_tab[$i]["url"] = "{$tab[0]}"; + $file_tab[$i]["url"] = "{$file_url}"; + $size_tab = lmb_size_convert( filesize( "{$file_tab[$i]["url"]}")); + } + $file_tab[$i]["format"] = "{$video_format}"; + $file_tab[$i]["size"] = "{$size_tab["size"]}"; + $file_tab[$i]["unit"] = "{$size_tab["unit"]}"; + } + } + + return( $file_tab); +} + + + +/*--------------------------------------------------------------------------------------------------------------------*/ +/* Video File Tab Get */ +/*--------------------------------------------------------------------------------------------------------------------*/ + +function lmb_video_file_tab_get2( $play_type, $play_id, $play_priority, $video_id, $video_codec, $mode) +{ + global $lmb_url_post; + + + $play_path = lmb_play_path_get( $play_type, $play_id, $play_priority); + $video_path = "{$play_path}/videos"; + + $cmd = "ls {$video_path}/{$video_id}* | sed -e 's/.*-//' | grep -v icon | grep -v poster | sort -rn"; + exec( $cmd, $video_format_tab); + + $file_tab = array(); + + for( $i = 0; $i < count($video_format_tab); $i++) + { + $video_format = "{$video_format_tab[$i]}"; + $file_url = "{$video_path}/{$video_id}-{$video_format}"; + + + if( count( glob( "{$file_url}"))) + { + if( $mode == "MULTI") + { + $file_tab[$i]["url"] = "{$lmb_url_post}?page=download&type={$play_type}&id={$play_id}&priority={$play_priority}&dtype=video&vformat={$video_format}"; + + $file_size = lmb_download_videos( $play_type, $play_id, $play_priority, $video_format, "SIZE"); + $size_tab = lmb_size_convert( $file_size); + } + else + { + $file_tab[$i]["url"] = "{$file_url}"; $size_tab = lmb_size_convert( filesize( "{$file_tab[$i]["url"]}")); } @@ -2352,10 +2416,10 @@ function lmb_videolist( $play_type, $play_id, $play_priority, $skin_path) ob_start(); - $cmd="ls {$video_path}/*-icon.png | sed -e 's/-icon.png$//' -e 's/.*\///'"; - exec($cmd, $video_tab); + $cmd="ls {$video_path}/* | sed -e 's/.*\.//' | grep -v \"png\" | sort -ru"; + exec($cmd, $codec_tab); - if( count($video_tab) == 0 || ( file_exists( "{$video_path}/.hide" ) && ! lmb_admin_is())) + if( count( $codec_tab) == 0 || ( file_exists( "{$video_path}/.hide" ) && ! lmb_admin_is())) { echo "   
 No video found...  @@ -2364,44 +2428,67 @@ function lmb_videolist( $play_type, $play_id, $play_priority, $skin_path) } else { - $height = max( 110, ( ( 220 - 30) / count($video_tab))); - - $file_tab = lmb_video_file_tab_get( $play_type, $play_id, $play_priority, "*", "MULTI"); - - $entry_tag = " - -   All the Videos  + $codec_nb = count( $codec_tab); + $title_tag = "   All the Videos  "; - lmb_file_entry_print( $file_tab, "videos5", "videos6", $entry_tag, count( $file_tab)); + $file_tab = array(); + $max_file_nb = 0; + + foreach( $codec_tab as $codec) + { + $file_tab[ $codec] = lmb_video_file_tab_get( $play_type, $play_id, $play_priority, "*", "{$codec}", "MULTI"); + $max_file_nb = max( $max_file_nb, count( $file_tab[ $codec])); + } + + foreach( $codec_tab as $codec) + { + $entry_tag = " +${title_tag}   +  {$codec}  +"; + + lmb_file_entry_print( $file_tab[ $codec], "videos5", "videos6", "{$entry_tag}", $max_file_nb); + + $title_tag = ""; + } + + + $cmd="ls {$video_path}/* | grep -v -- -icon | grep -v -- -poster | sed -e 's/-[0-9][0-9]*p//' -e 's/.*\///' | sort -u"; + exec($cmd, $video_tab); + + $height = max( 86, ( ( 220 - 30 * $codec_nb) / count($extra_tab))); for( $i = 0; $i < count($video_tab); $i++) { - $tab = explode( "-", $video_tab[$i]); - + $tab = explode( ".", "{$video_tab[$i]}"); $video_id = "{$tab[0]}"; + $video_codec = "{$tab[1]}"; + + $tab = explode( "-", "{$video_id}"); + + $video_subid = "{$tab[0]}"; $video_track = "{$tab[1]}"; $video_mix = "{$tab[2]}"; $video_track_name = ucwords( str_replace( "_", " ", "{$video_track}")); $video_mix_name = ucwords( str_replace( "_", " ", "{$video_mix}")); - $video_file = "{$video_id}-{$video_track}-{$video_mix}"; - /* Video Entry */ - $file_tab = lmb_video_file_tab_get( $play_type, $play_id, $play_priority, $i+1, "MONO"); + $file_tab = lmb_video_file_tab_get( $play_type, $play_id, $play_priority, "{$video_id}", "{$video_codec}", "MONO"); $css_row = $i % 2 + 1; $entry_tag = " - \"\"/ -  {$video_id}  + \"\"/ +  {$video_subid}   {$video_track_name}   {$video_mix_name}  +  {$video_codec}  "; - lmb_file_entry_print( $file_tab, "videos5", "videos6", "{$entry_tag}", count( $file_tab)); + lmb_file_entry_print( $file_tab, "videos5", "videos6", "{$entry_tag}", $max_file_nb); } } @@ -2439,8 +2526,8 @@ function lmb_extra_file_tab_get( $play_type, $play_id, $play_priority, $extra_id if( "{$extra_format}" != "icon") { $file_url = "{$extra_path}/{$play_id}-{$extra_id}-{$extra_format}.png"; - $file_tag = "{$file_tag}"; - +// $file_tag = "{$file_tag}"; +// echo ("EI: {$extra_id} FMT: {$extra_format} FU: $file_url\n"); if( count( glob( "{$file_url}"))) { if( $mode == "MULTI") @@ -2463,7 +2550,7 @@ function lmb_extra_file_tab_get( $play_type, $play_id, $play_priority, $extra_id } } - return( $file_tab); + return( $file_tab); } @@ -2844,18 +2931,28 @@ function lmb_tracklist_body( $skin_path) $track_mix = "{$track_info_list[$i]["mix"]}"; $track_length = "{$track_info_list[$i]["length"]}"; $track_album = "{$track_info_list[$i]["album"]}"; + $track_hide = "{$track_info_list[$i]["hide"]}"; $play_url = "{$lmb_url_post}?page=play&type={$play_type}&id={$play_id}&priority={$play_priority}"; $track_url = "{$lmb_url_post}?page=track&type={$play_type}&id={$play_id}&priority={$play_priority}&tid={$track_id}"; $path = lmb_playtype_path_get( $play_type); - if( ! file_exists( "{$path}/{$play_priority}-{$play_id}/.hide" )) + if( "{$track_hide}" == "y") + { + $hide_flag="*"; + } + else + { + $hide_flag=""; + } + + if( ( "{$track_hide}" == "n") || lmb_admin_is()) { echo " "; - echo " {$row}  
{$track_title}
  
{$track_mix}
  {$track_length}  {$play_type_name}  
{$track_album}
  + echo " {$row}  
{$track_title}{$hide_flag}
  
{$track_mix}
  {$track_length}  {$play_type_name}  
{$track_album}
  "; $row++; } @@ -3124,11 +3221,12 @@ function lmb_jplayer_insert( $play_type, $play_id, $play_priority, $track_id, $t - @@ -3252,7 +3350,7 @@ To play the media you will need to either update your browser to a recent versio /*--------------------------------------------------------------------------------------------------------------------*/ -/* Track Introduction */ +/* Track Introduction */ /*--------------------------------------------------------------------------------------------------------------------*/ function lmb_track_intro( $play_type, $play_id, $play_priority, $track_id, $track_name, $track_mix, $skin_path) @@ -3290,7 +3388,7 @@ function lmb_track_intro( $play_type, $play_id, $play_priority, $track_id, $trac - + +/*--------------------------------------------------------------------------------------------------------------------*/ +/* Track Video */ +/*--------------------------------------------------------------------------------------------------------------------*/ + +function lmb_track_video( $play_type, $play_id, $play_priority, $track_id, $track_name, $track_mix, $skin_path) +{ + global $lmb_cookie_tab; + global $lmb_url_pre; + + + $play_path = lmb_play_path_get( $play_type, $play_id, $play_priority); + $cover_path = "{$play_path}/covers/{$play_id}-cover"; + $logo_path = "{$play_path}/logos/{$play_id}-logo"; + $track_path = "{$play_path}/tracks"; + $video_path = "{$play_path}/videos"; + + $video_res_cookie = "video_res"; + $prefix_url = "{$lmb_url_post}?cookie_id={$video_res_cookie}&cookie_value="; + $query_string = preg_replace( "/cookie_id={$video_res_cookie}&cookie_value=[^&]*&/", "", "{$_SERVER['QUERY_STRING']}"); + $video_res_1080p_url = htmlentities( "{$prefix_url}1080p&{$query_string}"); + $video_res_720p_url = htmlentities( "{$prefix_url}720p&{$query_string}"); + $video_res_360p_url = htmlentities( "{$prefix_url}360p&{$query_string}"); + + $video_res = $lmb_cookie_tab[$video_res_cookie]; + + $video_res_tab = array(); + + if( "{$video_res}" == "") + { + $video_res = "1080p"; + } + + switch("{$video_res}") + { + case "1080p": + { + $video_res_1080p_class = "link-item-disabled"; + $video_res_720p_class = "link-item"; + $video_res_360p_class = "link-item"; + + break; + } + + case "720p": + { + $video_res_1080p_class = "link-item"; + $video_res_720p_class = "link-item-disabled"; + $video_res_360p_class = "link-item"; + + break; + } + + case "360p": + { + $video_res_1080p_class = "link-item"; + $video_res_720p_class = "link-item"; + $video_res_360p_class = "link-item-disabled"; + + break; + } + } + + if( "{$track_mix}" == "") + { + $video_file_base = "{$track_id}-{$track_name}"; + } + else + { + $video_file_base = "{$track_id}-{$track_name}-{$track_mix}"; + } + + $video_file_ogv = "{$video_path}/{$video_file_base}-{$video_res}.ogv"; + $video_file_webm = "{$video_path}/{$video_file_base}-{$video_res}.webm"; + $video_file_mp4 = "{$video_path}/{$video_file_base}-{$video_res}.mp4"; + $poster_file = "{$video_path}/{$video_file_base}-poster.png"; + + if( file_exists( "{$video_file_mp4}")) + { + echo " +"; + ob_start(); + + echo " + + + + + + + + + + + + + + + + + + + + + + + +"; + + + $data = ob_get_contents(); + ob_end_clean(); + + lmb_make_tab( "video", "videos", "r", "/{$logo_path}-1-128.png", $data, $skin_path); + + echo " + +"; + } +} + + + /*--------------------------------------------------------------------------------------------------------------------*/ /* Track Download */ /*--------------------------------------------------------------------------------------------------------------------*/ @@ -3388,7 +3617,6 @@ function lmb_track_download( $play_type, $play_id, $play_priority, $track_id, $t $file_tag = lmb_track_file_tag_get( $play_type, $play_id, $play_priority, $track_id); - echo " {$file_tag} - + "; + + $file_tab = lmb_video_file_tab_get( $play_type, $play_id, $play_priority, "{$track_id}-{$track_name}-{$track_mix}", "mp4", "MONO"); + + if( count( $file_tab) != 0 && ( ! file_exists( "{$video_path}/.hide" ) || lmb_admin_is())) + { + for( $i = 0; $i < count($file_tab); $i++) + { + $file_tab[$i]["format"] = "mp4 {$file_tab[$i]["format"]}"; + } + + lmb_file_entry_print( $file_tab, "tracks7", "tracks6", "{$entry_tag}", 4); + } + + echo "
InformationsInformation
@@ -3373,6 +3471,137 @@ echo "
+ +
+ +






@@ -3403,7 +3631,21 @@ function lmb_track_download( $play_type, $play_id, $play_priority, $track_id, $t Download 

@@ -3522,6 +3764,9 @@ function lmb_track_body( $play_type, $play_id, $play_priority, $track_id, $skin_ /* --- Introduction --- */ lmb_track_intro( $play_type, $play_id, $play_priority, $track_id, $track_name, $track_mix, $skin_path); + /* --- Introduction --- */ + lmb_track_video( $play_type, $play_id, $play_priority, $track_id, $track_name, $track_mix, $skin_path); + /* --- Download --- */ lmb_track_download( $play_type, $play_id, $play_priority, $track_id, $track_name, $track_mix, $skin_path); } @@ -3638,7 +3883,7 @@ function lmb_download_covers( $play_type, $play_id, $play_priority, $cover_forma function lmb_download_videos( $play_type, $play_id, $play_priority, $video_format, $mode) { $play_dir = lmb_play_path_get( $play_type, $play_id, $play_priority); - $file_list = "videos/*-{$video_format}.avi"; + $file_list = "videos/*-{$video_format}.mp4"; return( lmb_download_file( $play_dir, $file_list, $mode, "{$play_id}-{$video_format}")); }