Mirror/Gazelle
1
0
Fork 0
mirror of https://github.com/WhatCD/Gazelle.git synced 2025-01-05 22:10:11 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Empty commit

Browse Source
This commit is contained in:
Git 2011-11-22 08:00:17 +00:00
parent bc3892a474
commit bc00e76aa1
3 changed files with 22 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
classes/script_start.php
View File

@ -1635,10 +1635,11 @@ function display_artists($Artists, $MakeLink = true, $IncludeHyphen = true, $Esc
$Conductors = $Artists[5]; $Conductors = $Artists[5];
$DJs = $Artists[6]; $DJs = $Artists[6];
if (count($MainArtists) + count($Composers) + count($Conductors) == 0) { if (count($MainArtists) + (count($Composers)<3?count($Composers):0) + count($Conductors) + count($DJs) == 0) {
return ''; return '';
} }
// Various Composers is not needed and is ugly and should die
switch(count($Composers)) { switch(count($Composers)) {
case 0: case 0:
break; break;
@ -1648,12 +1649,10 @@ function display_artists($Artists, $MakeLink = true, $IncludeHyphen = true, $Esc
case 2: case 2:
$link .= display_artist($Composers[0], $MakeLink, $Escape).$ampersand.display_artist($Composers[1], $MakeLink, $Escape); $link .= display_artist($Composers[0], $MakeLink, $Escape).$ampersand.display_artist($Composers[1], $MakeLink, $Escape);
break; break;
default:
$link .= 'Various Composers';
} }
$ComposerStr .= $link; $ComposerStr .= $link;
if ((count($Composers) > 0) && (count($MainArtists) > 0)) { if ((count($Composers) > 0) && (count($Composers) < 3) && (count($MainArtists) > 0)) {
$link .= ' performed by '; $link .= ' performed by ';
} }
@ -1670,7 +1669,7 @@ function display_artists($Artists, $MakeLink = true, $IncludeHyphen = true, $Esc
$link .= 'Various Artists'; $link .= 'Various Artists';
} }
if(!empty($Guests) && (count($MainArtists) + count($Composers) + count($Conductors) < 3)) { if(!empty($Guests) && (count($MainArtists) + count($Composers) > 0) && (count($MainArtists) + count($Composers) + count($Conductors) < 3)) {
switch(count($Guests)) { switch(count($Guests)) {
case 1: case 1:
$link .= ' with '.display_artist($Guests[0], $MakeLink, $Escape); $link .= ' with '.display_artist($Guests[0], $MakeLink, $Escape);
@ -1681,7 +1680,7 @@ function display_artists($Artists, $MakeLink = true, $IncludeHyphen = true, $Esc
} }
} }
if ((count($Conductors) > 0) && (count($MainArtists) + count($Composers) > 0)) { if ((count($Conductors) > 0) && (count($MainArtists) + count($Composers) > 0) && (count($Composers) < 3 || count($MainArtists) > 0)) {
$link .= ' under '; $link .= ' under ';
} }
switch(count($Conductors)) { switch(count($Conductors)) {

7
sections/torrents/takeedit.php
View File

@ -213,6 +213,13 @@
} }
} }
// Strip out amazon's padding
$AmazonReg = '/(http:\/\/ecx.images-amazon.com\/images\/.+)(\._.*_\.jpg)/i';
$Matches = array();
if (preg_match($RegX, $Properties['Image'], $Matches)) {
$Properties['Image'] = $Matches[1].'.jpg';
}
if($Err){ // Show the upload form, with the data the user entered if($Err){ // Show the upload form, with the data the user entered
if(check_perms('site_debug')) { if(check_perms('site_debug')) {
die($Err); die($Err);

10
sections/upload/upload_handle.php
View File

@ -272,7 +272,8 @@
2 => array(), 2 => array(),
3 => array(), 3 => array(),
4 => array(), 4 => array(),
5 => array() 5 => array(),
6 => array()
); );
for($i = 0, $il = count($Artists); $i < $il; $i++) { for($i = 0, $il = count($Artists); $i < $il; $i++) {
if(trim($Artists[$i]) != "") { if(trim($Artists[$i]) != "") {
@ -306,6 +307,13 @@
die(); die();
} }
// Strip out amazon's padding
$AmazonReg = '/(http:\/\/ecx.images-amazon.com\/images\/.+)(\._.*_\.jpg)/i';
$Matches = array();
if (preg_match($RegX, $Properties['Image'], $Matches)) {
$Properties['Image'] = $Matches[1].'.jpg';
}
//******************************************************************************// //******************************************************************************//
//--------------- Make variables ready for database input ----------------------// //--------------- Make variables ready for database input ----------------------//