diff --git a/ReadMe.txt b/ReadMe.txt index 80410a8..3d7c4cc 100644 --- a/ReadMe.txt +++ b/ReadMe.txt @@ -18,7 +18,7 @@ LMBrose generate the following type of pages: - Play (EP, LP, Oldies) Pages, - Track Pages. -This script is curently used to build the "Langueur Monotone Pages" on http://www.langueur-monotone.com. +This script is curently used to build the "Langueur Monotone Pages" on http://www.langueur-monotone.com. diff --git a/ReleaseNotes.txt b/ReleaseNotes.txt index cd5b97b..8162475 100644 --- a/ReleaseNotes.txt +++ b/ReleaseNotes.txt @@ -1,3 +1,14 @@ +------------------------------------------------------------------------------------------------------------------------------------ +LMBrowse V 1.9.2 - A. GIBERT - 2026/07/26 +------------------------------------------------------------------------------------------------------------------------------------ + +- Fix extra zip file name, +- Optimize HTML global size, +- Fix HTML tags, +- Fix HTML indentation. + + + ------------------------------------------------------------------------------------------------------------------------------------ LMBrowse V 1.9.1 - A. GIBERT - 2026/07/19 ------------------------------------------------------------------------------------------------------------------------------------ diff --git a/env.dist b/env.dist index 34649f2..51802d7 100644 --- a/env.dist +++ b/env.dist @@ -21,7 +21,7 @@ APPL_NAME="lmbrowse" APPL_NAME_FULL="LMBrowse Docker Image" APPL_NAME_SHORT="lmb" APPL_ORG="rx3" -APPL_VERSION="1.0.0" +APPL_VERSION="1.0.1" APPL_MAINTAINER='"Arnaud G. GIBERT" ' diff --git a/src/html/lmbrowse.php b/src/html/lmbrowse.php index cc70cc6..98610be 100644 --- a/src/html/lmbrowse.php +++ b/src/html/lmbrowse.php @@ -40,7 +40,7 @@ $time_start = microtime_float(); include "lmbrowse_config.inc"; $lmb_myname="LMBrowse"; -$lmb_myver="1.9.1-1"; +$lmb_myver="1.9.2"; @@ -486,7 +486,7 @@ function lmb_make_tab( $tab_id, $css_id, $tab_side, $logo_path, $img_path, $data $r_tag = "$tab_tag"; } - echo " + echo " @@ -495,12 +495,11 @@ function lmb_make_tab( $tab_id, $css_id, $tab_side, $logo_path, $img_path, $data @@ -509,8 +508,7 @@ function lmb_make_tab( $tab_id, $css_id, $tab_side, $logo_path, $img_path, $data
  - "; - echo ""; + ".PHP_EOL; echo $data; - echo " + echo "
 
- "; - echo ""; + ".PHP_EOL; } @@ -522,15 +520,14 @@ function lmb_make_tab( $tab_id, $css_id, $tab_side, $logo_path, $img_path, $data function lmb_spacer( $size) { - echo " "; + echo " "; for( $i = 0; $i < $size; $i++) { echo "
"; } - echo ""; - echo ""; + echo "".PHP_EOL; } @@ -561,13 +558,11 @@ function lmb_menu( $menu_id, $skin_path) { if( $i == $menu_id) { - echo "
"; - echo ""; + echo "
".PHP_EOL; } else { - echo "
"; - echo ""; + echo "
".PHP_EOL; } break; } @@ -576,13 +571,11 @@ function lmb_menu( $menu_id, $skin_path) { if( $i == $menu_id) { - echo "
"; - echo ""; + echo "
".PHP_EOL; } else { - echo "
"; - echo ""; + echo "
".PHP_EOL; } break; } @@ -591,13 +584,11 @@ function lmb_menu( $menu_id, $skin_path) { if( $i == $menu_id) { - echo "
"; - echo ""; + echo "
".PHP_EOL; } else { - echo "
"; - echo ""; + echo "
".PHP_EOL; } break; } @@ -610,8 +601,7 @@ function lmb_menu( $menu_id, $skin_path) if( $i < 2) { - echo " "; - echo ""; + echo " ".PHP_EOL; } } } @@ -656,11 +646,10 @@ function lmb_header( $page_id, $page_name, $page_title, $description, $keywords, // echo ""; // echo ""; - echo ""; + echo "".PHP_EOL; // echo ""; - echo ""; - echo ""; + echo "".PHP_EOL; echo " @@ -669,8 +658,7 @@ function lmb_header( $page_id, $page_name, $page_title, $description, $keywords, - $page_name"; - echo ""; + $page_name".PHP_EOL; if( $lmb_ga_enable == true) { @@ -696,15 +684,12 @@ function lmb_header( $page_id, $page_name, $page_title, $description, $keywords, gtag('js', new Date()); gtag('config', 'UA-37642754-1'); - "; - echo ""; + ".PHP_EOL; } - echo " "; - echo ""; + echo " ".PHP_EOL; - echo " "; - echo ""; + echo " ".PHP_EOL; /* Modal Window */ echo " "; - echo ""; + ".PHP_EOL; echo "
- \"\" + \"\"/
-
"; - echo ""; + ".PHP_EOL; echo " - "; - echo ""; - - echo " "; - echo ""; - - echo " + + + - "; - echo ""; - - echo " "; - echo ""; - - echo " + + + @@ -776,13 +751,11 @@ document.addEventListener('keydown', e => - - "; - echo ""; + ".PHP_EOL; lmb_menu( $page_id, $skin_path); - echo " + echo " @@ -800,8 +773,7 @@ document.addEventListener('keydown', e => - "; - echo ""; + ".PHP_EOL; - echo " + echo "

Langueur Monotone

Langueur Monotone

$page_title

$page_title
- "; - echo ""; + ".PHP_EOL; } @@ -822,22 +794,19 @@ function lmb_footer( $skin_path) - echo " + echo "
- - @@ -863,12 +832,11 @@ function lmb_footer( $skin_path) - "; - echo ""; + ".PHP_EOL; if( lmb_admin_is()) { - echo " + echo " @@ -893,32 +861,29 @@ function lmb_footer( $skin_path) - "; - echo ""; + ".PHP_EOL; } else { - echo " "; - echo ""; + ".PHP_EOL; } $time_stop = microtime_float(); $time_elaps = intval( ( $time_stop - $time_start) * 1000) / 1000; - echo " + echo "
   
+ echo "
-
- Page generated in $time_elaps seconds by
{$lmb_myname}
V {$lmb_myver}"; - echo ""; + Page generated in $time_elaps seconds by
{$lmb_myname}
V {$lmb_myver}".PHP_EOL; echo " @@ -933,8 +898,7 @@ function lmb_footer( $skin_path) -"; - echo ""; +".PHP_EOL; } @@ -958,8 +922,7 @@ function lmb_welcome_tab( $skin_path) ".lmb_html_text_format( "{$welcome_string}")." - "; - echo ""; + ".PHP_EOL; $data = ob_get_contents(); ob_end_clean(); @@ -1044,29 +1007,25 @@ function lmb_news_json_ld( $news_tab) \"@context\": { \"ical\": \"http://www.w3.org/2002/12/cal/ical#\", \"xsd\": \"http://www.w3.org/2001/XMLSchema#\" - },"; - echo ""; + },".PHP_EOL; if( "{$news_tab[$i]["news"]}" == "") { echo " \"ical:summary\": \"".lmb_xml_text_format( "{$news_tab[$i]["title"]}: {$news_tab[$i]["name"]}")."\", \"ical:description\": \"".lmb_xml_text_format( "{$news_tab[$i]["title"]}").": ".lmb_xml_text_format( "{$news_tab[$i]["name"]}")."\", \"ical:url\": \"{$news_tab[$i]["alink"]}\", - \"ical:attach\": \"{$news_tab[$i]["aimg"]}\","; - echo ""; + \"ical:attach\": \"{$news_tab[$i]["aimg"]}\",".PHP_EOL; } else { echo " \"ical:summary\": \"".lmb_xml_text_format( "{$news_tab[$i]["title"]}")."\", \"ical:description\": \"".lmb_xml_text_format( "{$news_tab[$i]["news"]}")."\", \"ical:url\": \"http://www.langueur-monotone.com/\", - \"ical:attach\": \"http://www.langueur-monotone.com/skin/images/lm-logo2-96.png\","; - echo ""; + \"ical:attach\": \"http://www.langueur-monotone.com/skin/images/lm-logo2-96.png\",".PHP_EOL; } echo " \"ical:dtstart\": \"{$news_tab[$i]["date"]}\" -}"; - echo ""; +}".PHP_EOL; } } @@ -1122,8 +1081,7 @@ function lmb_news_tab( $skin_path) {$news_tab[$i]["date"]} ".lmb_html_text_format( "{$news}")." {$play_tag} - "; - echo ""; + ".PHP_EOL; } $data = ob_get_contents(); @@ -1177,14 +1135,12 @@ function lmb_sitemap_item( $item_type, $page_url, $img_tab) global $lmb_url_post; - echo " "; - echo ""; + echo " ".PHP_EOL; echo " http://{$lmb_url_pre}{$lmb_url_post}${page_url} 2013-08-20 weekly - 0.5"; - echo ""; + 0.5".PHP_EOL; if( isset( $img_tab)) { @@ -1193,13 +1149,11 @@ function lmb_sitemap_item( $item_type, $page_url, $img_tab) echo " http://{$lmb_url_pre}/{$img["url"]} {$img["title"]} - "; - echo ""; + ".PHP_EOL; } } - echo " "; - echo ""; + echo " ".PHP_EOL; } @@ -1333,9 +1287,7 @@ function lmb_sitemap_page() echo " -"; - echo ""; - echo ""; +".PHP_EOL.PHP_EOL; $img_tab = array(); $size = 220; @@ -1365,8 +1317,7 @@ function lmb_sitemap_page() $time_elaps = intval( ( $time_stop - $time_start) * 1000) / 1000; echo " -"; - echo ""; +".PHP_EOL; } @@ -1397,8 +1348,7 @@ function lmb_rss_page() http://{$lmb_url_pre}/skin/images/lm-logo2-border-rss.png Langueur Monotone News Page http://{$lmb_url_pre}/ - "; - echo ""; + ".PHP_EOL; $news_tab = lmb_news_tab_get(); @@ -1407,24 +1357,20 @@ function lmb_rss_page() $news = lmb_xml_text_format( $news_tab[$i]["news"]); $pubdate = date("r", strtotime($news_tab[$i]["date"])); - echo " "; - echo ""; + echo " ".PHP_EOL; if( "{$news_tab[$i]["name"]}" != "") { - echo " {$news_tab[$i]["title"]}: {$news_tab[$i]["name"]}"; - echo ""; + echo " {$news_tab[$i]["title"]}: {$news_tab[$i]["name"]}".PHP_EOL; } else { - echo " {$news_tab[$i]["title"]}"; - echo ""; + echo " {$news_tab[$i]["title"]}".PHP_EOL; } echo " {$pubdate} Langueur Monotone - http://{$lmb_url_pre}/#$i"; - echo ""; + http://{$lmb_url_pre}/#$i".PHP_EOL; if( "{$news_tab[$i]["name"]}" != "") { @@ -1441,22 +1387,18 @@ function lmb_rss_page() echo '


'; echo "{$data}"; - echo '


]]>'; - echo ""; - echo " "; - echo ""; + echo '


]]>'.PHP_EOL; + echo " ".PHP_EOL; } echo " -"; - echo ""; +".PHP_EOL; $time_stop = microtime_float(); $time_elaps = intval( ( $time_stop - $time_start) * 1000) / 1000; - echo ""; - echo ""; + echo "".PHP_EOL; } @@ -1480,8 +1422,7 @@ function lmb_about_tab( $skin_path) echo " ".lmb_html_text_format( "{$about_string}")." - "; - echo ""; + ".PHP_EOL; $data = ob_get_contents(); ob_end_clean(); @@ -1514,20 +1455,17 @@ function lmb_history_tab( $skin_path) {$history_line[0]} {$history_line[1]} -
"; - echo ""; +
".PHP_EOL; for( $j = 2; $j < count($history_line); $j++) { - echo " ".lmb_html_text_format( "{$history_line[$j]}")."
"; - echo ""; + echo " ".lmb_html_text_format( "{$history_line[$j]}")."
".PHP_EOL; } echo "
- "; - echo ""; + ".PHP_EOL; } $data = ob_get_contents(); @@ -1625,8 +1563,7 @@ function lmb_playlist_cur( $play_type, $path, $row, $skin_path) $url = "{$lmb_url_post}?page=play&type={$play_type}&id={$play_tab[1]}&priority={$play_tab[0]}"; - echo " \"\"/
{$play_info["name"]}
 {$play_info["month"]} {$play_info["year"]} {$play_info["comment"]} "; - echo ""; + echo " \"\"/
{$play_info["name"]}
 {$play_info["month"]} {$play_info["year"]} {$play_info["comment"]} ".PHP_EOL; } else { @@ -1674,8 +1611,7 @@ function lmb_playlist_next( $play_type, $path, $row, $skin_path) $comment = ""; } - echo " {$icon_tag}{$tab[0]} {$tab[1]} {$tab[2]} {$comment} "; - echo ""; + echo " {$icon_tag}{$tab[0]} {$tab[1]} {$tab[2]} {$comment} ".PHP_EOL; } } @@ -1781,14 +1717,12 @@ function lmb_play_intro( $play_type, $play_id, $play_priority, $skin_path) -
"; - echo ""; +
".PHP_EOL; $intro_file = "{$play_path}/.intro"; $intro_string = file_get_contents( "{$intro_file}"); - echo " ".lmb_html_text_format( "{$intro_string}")."
"; - echo ""; + echo " ".lmb_html_text_format( "{$intro_string}")."
".PHP_EOL; echo "
@@ -1824,14 +1758,12 @@ function lmb_play_intro( $play_type, $play_id, $play_priority, $skin_path) -
"; - echo ""; +
".PHP_EOL; $hardware_file = "{$play_path}/.hardware"; $hardware_string = file_get_contents( "{$hardware_file}"); - echo " ".lmb_html_text_format( "{$hardware_string}")."
"; - echo ""; + echo " ".lmb_html_text_format( "{$hardware_string}")."
".PHP_EOL; echo "
@@ -1846,8 +1778,7 @@ function lmb_play_intro( $play_type, $play_id, $play_priority, $skin_path) - "; - echo ""; + ".PHP_EOL; } @@ -2017,8 +1948,7 @@ function lmb_track_file_tag_get( $play_type, $play_id, $play_priority, $track_id $file_tag = "{$file_tag}
{$file_type} {$file_subtype}
(${size_tab["size"]} {$size_tab["unit"]})
"; } - $file_tag = "{$file_tag} - "; + $file_tag = "{$file_tag}"; } return( "{$file_tag}"); @@ -2096,38 +2026,19 @@ function lmb_tracklist_microdata( $play_type, $play_id, $play_priority) $tracks_nb = count($track_list_info); - echo "
- - - -
- -
"; - echo ""; + echo "
".PHP_EOL; for( $i = 0; $i < $tracks_nb; $i++) { - echo "
- - - - - - - -
"; - echo ""; + echo "\"/>
".PHP_EOL; } - - echo " "; - echo ""; } @@ -2159,16 +2070,14 @@ function lmb_tracklist( $play_type, $play_id, $play_priority, $skin_path) // $title_tag = " \"\"/"; - echo " - "; - echo ""; + echo " + ".PHP_EOL; lmb_tracklist_microdata( $play_type, $play_id, $play_priority); - echo "    Full Album including covers  -{$file_tag} - "; - echo ""; + echo "    Full Album including covers  + + {$file_tag} ".PHP_EOL; for( $i = 0, $row = 1; $i < $track_nb; $i++, $row++) { @@ -2180,11 +2089,7 @@ function lmb_tracklist( $play_type, $play_id, $play_priority, $skin_path) $track_url = "{$lmb_url_post}?page=track&type={$play_type}&id={$play_id}&priority={$play_priority}&tid={$track_id}"; $file_tag = lmb_track_file_tag_get( $play_type, $play_id, $play_priority, $track_id); - - echo " "; - - echo " {$track_info["id"]}  
{$track_info["title"]}
  
{$track_info["mix"]}
  {$track_info["length"]}  {$track_info["composer"]}  {$track_info["comment"]} {$file_tag}"; - echo ""; + echo "  {$track_info["id"]}  
{$track_info["title"]}
  
{$track_info["mix"]}
  {$track_info["length"]}  {$track_info["composer"]}  {$track_info["comment"]} {$file_tag}".PHP_EOL; } $data = ob_get_contents(); @@ -2206,32 +2111,15 @@ function lmb_file_entry_print( $file_tab, $format_css_id, $size_css_id, $entry_t foreach( $file_tab as $file) { - echo " - - - - - -
{$file["format"]}
(${file["size"]} {$file["unit"]})
- "; - echo ""; + echo "
{$file["format"]}
(${file["size"]} {$file["unit"]})
"; } for( $i = count( $file_tab); $i < $max_nb; $i++) { - echo " - - - - - -
- "; - echo ""; + echo "
"; } - echo " "; - echo ""; + echo "".PHP_EOL; } @@ -2252,7 +2140,6 @@ function lmb_cover_file_tab_get( $play_type, $play_id, $play_priority, $cover_id exec( $cmd, $cover_format_tab); $file_tab = array(); - $file_tag = ""; for( $i = 0; $i < count($cover_format_tab); $i++) { @@ -2261,7 +2148,6 @@ function lmb_cover_file_tab_get( $play_type, $play_id, $play_priority, $cover_id if( "{$cover_format}" != "icon") { $file_url = "{$cover_path}/{$play_id}-cover-{$cover_id}-{$cover_format}.png"; - $file_tag = "{$file_tag}"; if( count( glob( "{$file_url}"))) { @@ -2314,9 +2200,7 @@ function lmb_coverlist( $play_type, $play_id, $play_priority, $skin_path) $file_tab = lmb_cover_file_tab_get( $play_type, $play_id, $play_priority, "*", "MULTI"); - $entry_tag = " -  All the Covers  - "; + $entry_tag = "   All the Covers "; lmb_file_entry_print( $file_tab, "covers3", "covers4", "{$entry_tag}", count( $file_tab)); @@ -2344,9 +2228,7 @@ function lmb_coverlist( $play_type, $play_id, $play_priority, $skin_path) $css_row = $i % 2 + 1; - $entry_tag = " - \"\" -  {$sheet_name} "; + $entry_tag = " \"\" {$sheet_name} "; lmb_file_entry_print( $file_tab, "covers3", "covers4", "{$entry_tag}", count( $file_tab)); @@ -2476,16 +2358,14 @@ function lmb_videolist( $play_type, $play_id, $play_priority, $skin_path) if( count( $codec_tab) == 0 || ( file_exists( "{$video_path}/.hide" ) && ! lmb_admin_is())) { - echo "    + echo "   
 No video found...  -   "; - echo ""; +   ".PHP_EOL; } else { $codec_nb = count( $codec_tab); - $title_tag = "   All the Videos  - "; + $title_tag = "   All the Videos "; $file_tab = array(); $max_file_nb = 0; @@ -2498,10 +2378,7 @@ function lmb_videolist( $play_type, $play_id, $play_priority, $skin_path) foreach( $codec_tab as $codec) { - $entry_tag = " -${title_tag}   -  {$codec}  - "; + $entry_tag = " ${title_tag}  {$codec} "; lmb_file_entry_print( $file_tab[ $codec], "videos5", "videos6", "{$entry_tag}", $max_file_nb); @@ -2535,13 +2412,7 @@ ${title_tag} &nbs $css_row = $i % 2 + 1; - $entry_tag = " - \"\"/ -  {$video_subid}  -  {$video_track_name}  -  {$video_mix_name}  -  {$video_codec}  - "; + $entry_tag = " \"\"/ {$video_subid}  {$video_track_name}  {$video_mix_name}  {$video_codec} "; lmb_file_entry_print( $file_tab, "videos5", "videos6", "{$entry_tag}", $max_file_nb); } @@ -2560,7 +2431,7 @@ ${title_tag} &nbs /* Extra File Tab Get */ /*--------------------------------------------------------------------------------------------------------------------*/ -function lmb_extra_file_tab_get( $play_type, $play_id, $play_priority, $extra_id, $mode) +function lmb_extra_file_tab_get( $play_type, $play_id, $play_priority, $extra_id, $extra_ratio, $mode) { global $lmb_url_post; @@ -2568,9 +2439,11 @@ function lmb_extra_file_tab_get( $play_type, $play_id, $play_priority, $extra_id $play_path = lmb_play_path_get( $play_type, $play_id, $play_priority); $extra_path = "{$play_path}/extras"; - $cmd = "ls {$extra_path}/{$play_id}-{$extra_id}-*.png | sed -e 's/.*-//' -e 's/.png$//' | sort -nu"; + $cmd = "ls {$extra_path}/{$play_id}-{$extra_id}-{$extra_ratio}-*.png | sed -e 's/.*-//' -e 's/.png$//' | sort -nu"; exec( $cmd, $extra_format_tab); + // echo "{$extra_path}/{$play_id}-X{$extra_id}X-Y{$extra_ratio}Y-*.png"; + $file_tab = array(); $file_tag = ""; @@ -2580,14 +2453,14 @@ 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_url = "{$extra_path}/{$play_id}-{$extra_id}-{$extra_ratio}-{$extra_format}.png"; // $file_tag = "{$file_tag}"; // echo ("EI: {$extra_id} FMT: {$extra_format} FU: $file_url\n"); 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=extra&eformat={$extra_id}-{$extra_format}"; + $file_tab[$i]["url"] = "{$lmb_url_post}?page=download&type={$play_type}&id={$play_id}&priority={$play_priority}&dtype=extra&eformat={$extra_ratio}-{$extra_format}"; $file_size = lmb_download_extras( $play_type, $play_id, $play_priority, $extra_format, "SIZE"); $size_tab = lmb_size_convert( $file_size); @@ -2622,40 +2495,36 @@ function lmb_extralist( $play_type, $play_id, $play_priority, $skin_path) ob_start(); - $cmd="ls {$extra_path}/{$play_id}-*-*-icon.png | sed -e 's/-icon.png$//' -e 's/.*{$play_id}-.*-//' | sort -u"; - exec( $cmd, $format_tab); + $cmd="ls {$extra_path}/{$play_id}-*-*-*-icon.png | sed -e 's/-icon.png$//' -e 's/.*{$play_id}-.*-//' | sort -u"; + exec( $cmd, $ratio_tab); - if( count($format_tab) == 0 || ( file_exists( "{$extra_path}/.hide" ) && ! lmb_admin_is())) + if( count($ratio_tab) == 0 || ( file_exists( "{$extra_path}/.hide" ) && ! lmb_admin_is())) { - echo "    + echo "   
 No extra found...  -   "; - echo ""; +   ".PHP_EOL; } else { - $format_nb = count($format_tab); - $title_tag = "   All the Extras  - "; + $ratio_nb = count($ratio_tab); + $title_tag = "  All the Extras "; $file_tab = array(); $max_file_nb = 0; - foreach( $format_tab as $format) + foreach( $ratio_tab as $ratio) { - $file_tab[ $format] = lmb_extra_file_tab_get( $play_type, $play_id, $play_priority, "*-{$format}", "MULTI"); - $max_file_nb = max( $max_file_nb, count( $file_tab[ $format])); + $file_tab[ $ratio] = lmb_extra_file_tab_get( $play_type, $play_id, $play_priority, "*", $ratio, "MULTI"); + $max_file_nb = max( $max_file_nb, count( $file_tab[ $ratio])); } - foreach( $format_tab as $format) + foreach( $ratio_tab as $ratio) { - $extra_format = str_replace( "_", "/", "{$format}"); + $extra_ratio = str_replace( "_", "/", "{$ratio}"); - $entry_tag = " -${title_tag}  {$extra_format}  - "; + $entry_tag = " ${title_tag} {$extra_ratio} "; - lmb_file_entry_print( $file_tab[ $format], "extras5", "extras6", "{$entry_tag}", $max_file_nb); + lmb_file_entry_print( $file_tab[ $ratio], "extras5", "extras6", "{$entry_tag}", $max_file_nb); $title_tag = ""; } @@ -2664,29 +2533,25 @@ ${title_tag} &nbs $cmd="ls {$extra_path}/{$play_id}-*-*-icon.png | sed -e 's/-icon.png$//' -e 's/.*{$play_id}-//' | sort "; exec( $cmd, $extra_tab); - $height = max( 86, ( ( 220 - 30 * $format_nb) / count($extra_tab))); + $height = max( 86, ( ( 220 - 30 * $ratio_nb) / count($extra_tab))); for( $i = 0; $i < count($extra_tab); $i++) { $tab = explode( "-", $extra_tab[$i]); $extra_type = ucwords( $tab[0]); $extra_subid = $tab[1]; + $extra_ratio = $tab[2]; $extra_format = str_replace( "_", "/", $tab[2]); - $extra_id = "{$tab[0]}-{$tab[1]}-{$tab[2]}"; - $extra_prefix = "{$extra_path}/{$play_id}-{$extra_id}"; + $extra_id = "{$tab[0]}-{$tab[1]}"; + $extra_prefix = "{$extra_path}/{$play_id}-{$extra_id}-{$extra_ratio}"; /* Extra Entry */ - $file_tab = lmb_extra_file_tab_get( "{$play_type}", "{$play_id}", "{$play_priority}", "{$extra_id}", "MONO"); + $file_tab = lmb_extra_file_tab_get( "{$play_type}", "{$play_id}", "{$play_priority}", "{$extra_id}", "{$extra_ratio}", "MONO"); $css_row = $i % 2 + 1; - $entry_tag = " - \"\" -  {$extra_type}  -  {$extra_subid}  -  {$extra_format}  - "; + $entry_tag = " \"\" {$extra_type}  {$extra_subid}  {$extra_format} "; lmb_file_entry_print( $file_tab, "extras5", "extras6", "{$entry_tag}", $max_file_nb); } @@ -2717,9 +2582,8 @@ function lmb_links_tab( $play_type, $play_id, $play_priority) exec( $cmd, $line); - echo " - "; - echo ""; + echo "
+ ".PHP_EOL; for( $i = 0; $i < count($line); $i++) { @@ -2758,23 +2622,14 @@ function lmb_links_tab( $play_type, $play_id, $play_priority) } - echo " - - - "; - echo ""; + echo " ".PHP_EOL; } - echo " + echo " -
-
{$text}
- 		-
{$text}
{$image_tag}
Links
"; - echo ""; + ".PHP_EOL; } @@ -2788,7 +2643,7 @@ function lmb_play_last( $play_type, $play_id, $play_priority, $skin_path) $play_path = lmb_play_path_get( $play_type, $play_id, $play_priority); - echo " + echo " @@ -2800,24 +2655,21 @@ function lmb_play_last( $play_type, $play_id, $play_priority, $skin_path) - + echo "
Thanks
- "; + ".PHP_EOL; $thanks_file = "{$play_path}/.thanks"; $thanks_string = file_get_contents( "{$thanks_file}"); - echo " ".lmb_html_text_format( "{$thanks_string}")."
"; - echo ""; + echo " ".lmb_html_text_format( "{$thanks_string}")."
".PHP_EOL; - echo "
- "; - echo ""; + ".PHP_EOL; lmb_links_tab( $play_type, $play_id, $play_priority); @@ -2826,8 +2678,7 @@ function lmb_play_last( $play_type, $play_id, $play_priority, $skin_path) - "; - echo ""; + ".PHP_EOL; } @@ -3017,8 +2868,7 @@ function lmb_tracklist_body( $skin_path) echo " "; - echo " {$row}  
{$track_title}{$hide_flag}
  
{$track_mix}
  {$track_length}  {$play_type_name}  
{$track_album}
 "; - echo ""; + echo " {$row}  
{$track_title}{$hide_flag}
  
{$track_mix}
  {$track_length}  {$play_type_name}  
{$track_album}
 ".PHP_EOL; $row++; } } @@ -3119,16 +2969,14 @@ function lmb_track_info( $play_type, $play_id, $play_priority, $track_id) Length
{$track_info["length"]}
- "; - echo ""; + ".PHP_EOL; if ($track_info["safe_creative"] != "") { echo " Safe Creative
Link
- "; - echo ""; + ".PHP_EOL; } echo " @@ -3136,8 +2984,7 @@ function lmb_track_info( $play_type, $play_id, $play_priority, $track_id) - "; - echo ""; + ".PHP_EOL; } @@ -3159,8 +3006,7 @@ function lmb_track_lyrics( $play_type, $play_id, $play_priority, $track_id, $tra -
"; - echo ""; +
".PHP_EOL; if( file_exists( "{$lyrics_file}")) @@ -3178,8 +3024,7 @@ function lmb_track_lyrics( $play_type, $play_id, $play_priority, $track_id, $tra - "; - echo ""; + ".PHP_EOL; } @@ -3261,8 +3106,7 @@ Your browser does not support the audio element. - "; - echo ""; + ".PHP_EOL; } @@ -3309,8 +3153,7 @@ function lmb_track_intro( $play_type, $play_id, $play_priority, $track_id, $trac Information - "; - echo ""; + ".PHP_EOL; lmb_track_info( $play_type, $play_id, $play_priority, $track_id); @@ -3327,8 +3170,7 @@ function lmb_track_intro( $play_type, $play_id, $play_priority, $track_id, $trac - - "; - echo ""; + ".PHP_EOL; } @@ -3477,8 +3317,7 @@ function lmb_track_video( $play_type, $play_id, $play_priority, $track_id, $trac if( file_exists( "{$video_file_mp4}")) { - echo " "; - echo ""; + echo " ".PHP_EOL; ob_start(); @@ -3514,8 +3353,7 @@ Your browser does not support the video tag. - "; - echo ""; + ".PHP_EOL; $data = ob_get_contents(); @@ -3524,8 +3362,7 @@ Your browser does not support the video tag. lmb_make_tab( "video", "videos", "r", "/{$logo_path}-1-128.png", "/{$logo_path}-1-1024.png", $data, $skin_path); echo " - "; - echo ""; + ".PHP_EOL; } } @@ -3578,8 +3415,7 @@ function lmb_track_download( $play_type, $play_id, $play_priority, $track_id, $t
"; - echo ""; + ".PHP_EOL; lmb_player_insert( $play_type, $play_id, $play_priority, $track_id, $track_name, $track_mix); @@ -3351,8 +3193,7 @@ function lmb_track_intro( $play_type, $play_id, $play_priority, $track_id, $trac -
"; - echo ""; + ".PHP_EOL; lmb_track_lyrics( $play_type, $play_id, $play_priority, $track_id, $track_name, $track_mix); @@ -3382,8 +3223,7 @@ function lmb_track_intro( $play_type, $play_id, $play_priority, $track_id, $trac





















- "; - echo ""; + ".PHP_EOL; $mix_list = glob( "discography/*/*/tracks/flac/*-{$track_name}*.flac"); @@ -3647,8 +3483,7 @@ function lmb_track_download( $play_type, $play_id, $play_priority, $track_id, $t - "; - echo ""; + ".PHP_EOL; } } @@ -3663,8 +3498,7 @@ function lmb_track_download( $play_type, $play_id, $play_priority, $track_id, $t
{$mix_tab[$k]["mix_name"]}
 {$mix_tab[$k]["play_type_name"]}
{$mix_tab[$k]["play_name"]}
- "; - echo ""; + ".PHP_EOL; } @@ -3702,6 +3536,26 @@ function lmb_track_body( $play_type, $play_id, $play_priority, $track_id, $skin_ +/*--------------------------------------------------------------------------------------------------------------------*/ +/* Cache Test */ +/*--------------------------------------------------------------------------------------------------------------------*/ + +function lmb_cache_test( $directory) +{ + $cache_dir = "{$directory}/cache"; + + // Check if any content file is newer than the cache directory + $count = (int)exec( "find {$directory} -newer {$cache_dir} -not -path '{$cache_dir}/*' | grep -c ."); + + if( $count > 0) + { + // Purge all caches, they are all potentially stale + array_map('unlink', glob("{$cache_dir}/*")); + } +} + + + /*--------------------------------------------------------------------------------------------------------------------*/ /* Track Page */ /*--------------------------------------------------------------------------------------------------------------------*/ @@ -3733,26 +3587,6 @@ function lmb_track_page( $play_type, $play_id, $play_priority, $track_id) -/*--------------------------------------------------------------------------------------------------------------------*/ -/* Cache Test */ -/*--------------------------------------------------------------------------------------------------------------------*/ - -function lmb_cache_test( $directory) -{ - $cache_dir = "{$directory}/cache"; - - // Check if any content file is newer than the cache directory - $count = (int)exec( "find {$directory} -newer {$cache_dir} -not -path '{$cache_dir}/*' | grep -c ."); - - if( $count > 0) - { - // Purge all caches, they are all potentially stale - array_map('unlink', glob("{$cache_dir}/*")); - } -} - - - /*--------------------------------------------------------------------------------------------------------------------*/ /* Download ZIP */ /*--------------------------------------------------------------------------------------------------------------------*/ @@ -3930,8 +3764,7 @@ function lmb_body( $id, $name, $curver, $currel)

- 
";
-    echo "";
+    
".PHP_EOL;
 
     lmb_tab_dump( $description, 0);
 
@@ -3939,24 +3772,20 @@ function lmb_body( $id, $name, $curver, $currel)
     

       

       

-    
";
-    echo "";
+    
".PHP_EOL;
     
     echo "    

       

     

 
     

-    
Last Release Notes:
";
-    echo "";
+    
Last Release Notes:
".PHP_EOL;
 
-    echo "    
";
-    echo "";
+    echo "    
".PHP_EOL;
 
     lmb_tab_dump( $change_log, 0);
 
-    echo "    
";
-    echo "";
+    echo "    
".PHP_EOL;
 
     $lmb_list = lmb_list_get( $id, $curver, $currel);
 
@@ -3970,8 +3799,7 @@ function lmb_body( $id, $name, $curver, $currel)
             echo "   $lmb_list[$i]";
         }
 
-        echo "
";
-        echo "";
+        echo "
".PHP_EOL;
     }
 
     echo"    

@@ -4028,9 +3856,7 @@ function lmb_cl_header( $id, $name, $curver, $currel)
 
     
Rx3.Org Main Page  /  Rx3 Free Software Packaging Main Page  /  Rx3 $name Home Page

 
-    

-";
-    echo "";
+    
".PHP_EOL;
 }