diff --git a/functions.php b/functions.php index 9747ea9..f422a5f 100755 --- a/functions.php +++ b/functions.php @@ -250,6 +250,8 @@ page-ce-mois-ci.php function displayRetina ($file,$album) { global $ppage; + + echo "$ppage"; //preprint($file); @@ -284,7 +286,7 @@ function displayRetina ($file,$album) { $name = explode(".", $file['filename']); $thumbpath = "../zenphoto/cache/" . $album . "/"; - $a = $path . $filename; + //$a = $path . $filename; $file_sd = $thumbpath . $name[0] . "_200_thumb.jpg"; $file_hd = $thumbpath . $name[0] . "_400_thumb.jpg"; @@ -362,7 +364,7 @@ function displayRetina ($file,$album) { $display .= ''; $display .= ''; $display .= '
'; - $display .= ''; + $display .= ''; $display .= ''.date_archive($file['filename']).''; $display .= '
'; $display .= '' . "\r\n"; @@ -373,106 +375,6 @@ function displayRetina ($file,$album) { } -function displayRetina_bak ($filename,$album) { - - global $ppage; - - if ($ppage == "1") { - $fullpath = "../../zenphoto/"; - } - else { - $fullpath = "../../../zenphoto/"; - } - $file = explode(".", $filename); - - $thumbpath = "../zenphoto/cache/" . $album . "/"; - $a = $path . $filename; - - $file_sd = $thumbpath . $file[0] . "_200_thumb.jpg"; - $file_hd = $thumbpath . $file[0] . "_400_thumb.jpg"; - -//echo $file_sd; -//echo $file_hd; - - /* - $file_sd = $path . $file[0] . "_180_watermark.jpg"; - $file_hd = $path . $file[0] . "_360_watermark.jpg"; - */ - - $th_sd = false; - $th_hd = false; - - $thumb = array(); - - if (file_exists($file_sd)) { - $th_sd = true; - $size_sd = getimagesize($file_sd, $info); - $thumb['sd'] = array( - 'url' => "../../" . $file_sd, - 'width' => $size_sd[0], - 'height' => $size_sd[1] - ); - } - if (file_exists($file_hd)) { - $th_hd = true; - $size_hd = getimagesize($file_hd, $info); - $thumb['hd'] = array( - 'url' => "../../" . $file_hd, - 'width' => $size_hd[0], - 'height' => $size_hd[1] - ); - } - - if (($th_sd == true) && ($th_hd == true)) { - $standard = $thumb['sd']['url'] . ' 200w, ' . $thumb['hd']['url'] . ' 400w'; - } - elseif ($th_sd == true) { - $standard = $thumb['sd']['url'] . ' 200w'; - } - elseif ($th_hd == true) { - $standard = $thumb['hd']['url'] . ' 400w'; - } - - - $display = '
'; - $display .= '
'; - $display .= ''; -/* - $display .= ''; - $display .= ''; - $display .= ''; - - $display .= ''; - $display .= ''; - $display .= ''; - - $display .= ''; - - $display .= ''; -*/ - $display .= ""; - - $display .= ''; - $display .= '
'; - $display .= '
'; - $display .= ''; - $display .= ''.date_archive($filename).''; - $display .= '
'; - $display .= '
' . "\r\n"; - -//echo "display: " . $display; - - return $display; - } /* *functions.php - displayRetina() displayRetina() diff --git a/page-ce-mois-ci.php b/page-ce-mois-ci.php index 70669a9..252a670 100755 --- a/page-ce-mois-ci.php +++ b/page-ce-mois-ci.php @@ -327,7 +327,7 @@ for ($j=$debut; $j<=$fin; $j++) {