Compare commits

..

No commits in common. "ae477ab8880247e992acc853b97fa3541ac6896b" and "c9f6b01fdcb0d7193649d9c34655b699ad06092e" have entirely different histories.

2 changed files with 15 additions and 22 deletions

View File

@ -54,9 +54,7 @@ function makeThumb($item = "") {
$imgdata = null; $imgdata = null;
for ( $i=0; $i<$zip->numFiles; $i++ ) { for ( $i=0; $i<$zip->numFiles; $i++ ) {
$imgname = basename($zip->getNameIndex($i)); $imgname = basename($zip->getNameIndex($i));
$parts = pathinfo($imgname); $imgext = strtolower(pathinfo($imgname)['extension']);
if ( isset($parts['extension']) ) {
$imgext = strtolower($parts['extension']);
if ( (strcmp($lowest, $imgname) > 0) if ( (strcmp($lowest, $imgname) > 0)
&& ((strcasecmp($imgext, "jpg") == 0) && ((strcasecmp($imgext, "jpg") == 0)
|| (strcasecmp($imgext, "png") == 0) || (strcasecmp($imgext, "png") == 0)
@ -65,7 +63,6 @@ function makeThumb($item = "") {
$imgdata = $zip->getFromIndex($i); $imgdata = $zip->getFromIndex($i);
} }
} }
}
$zip->close(); $zip->close();
if ( is_null($imgdata) ) return false; if ( is_null($imgdata) ) return false;
$didwrite = file_put_contents($outfile, $imgdata); $didwrite = file_put_contents($outfile, $imgdata);
@ -77,9 +74,7 @@ function makeThumb($item = "") {
$lowest = "~"; $lowest = "~";
foreach ( $entries as $entry ) { foreach ( $entries as $entry ) {
$imgname = $entry->getName(); $imgname = $entry->getName();
$parts = pathinfo($imgname); $imgext = strtolower(pathinfo($imgname)['extension']);
if ( isset($parts['extension']) ) {
$imgext = strtolower($parts['extension']);
if ( (strcmp($lowest, $imgname) > 0) if ( (strcmp($lowest, $imgname) > 0)
&& ((strcasecmp($imgext, "jpg") == 0) && ((strcasecmp($imgext, "jpg") == 0)
|| (strcasecmp($imgext, "png") == 0) || (strcasecmp($imgext, "png") == 0)
@ -89,7 +84,6 @@ function makeThumb($item = "") {
if ( !$didwrite ) { return false; } if ( !$didwrite ) { return false; }
} }
} }
}
rar_close($rar_file); rar_close($rar_file);
} else { } else {
return false; return false;

View File

@ -12,7 +12,6 @@ var lightbox = null;
function getFolderContents() { function getFolderContents() {
$("#list").html(""); $("#list").html("");
toastr.info("Loading folder contents. Comics containing a large number of issues, or issues with a large number of pages, that have not been opened recently may take some time to load. Thank you for your patience!", "Loading Contents...", {timeOut: 15000});
$.ajax({ $.ajax({
url : 'ajax/getfoldercontents.php', url : 'ajax/getfoldercontents.php',
dataType : 'json', dataType : 'json',