From: Alexander Sadleir <maxious@lambdacomplex.org>
Date: Sat, 17 Sep 2011 09:03:42 +0000
Subject: Change to simple white on black autoscaling header
X-Git-Url: https://maxious.lambdacomplex.org/git/?p=photocalendar.git&a=commitdiff&h=aa93aeb5a1a53f83058b70013f61cc46a19a64c2
---
Change to simple white on black autoscaling header
---


--- a/common.inc.php
+++ b/common.inc.php
@@ -81,16 +81,20 @@
         return START_DATE;
     }
 }
+
 function getDateFromFilename($filename) {
-    $fnameParts = explode(".",$filename);
+    $fnameParts = explode(".", $filename);
     return $fnameParts[0];
 }
-function getFilenameForDate($date,$fileext = "") {
-    $results = glob(DATA_DIR."/".$date."*".$fileext);
+
+function getFilenameForDate($date, $fileext = "") {
+    $results = glob(DATA_DIR . "/" . $date . "*" . $fileext);
     if (sizeof($results) > 0) {
-    return $results[0];
-    } else return false;
-}
+        return $results[0];
+    } else
+        return false;
+}
+
 function getPreviousDate() {
     $datedFiles = scandir(DATA_DIR); // sorted descendingly by default
     if (sizeof($datedFiles) > 2) {// always at least 2 even for an empty folder because of ./ and ../
@@ -105,9 +109,9 @@
     if (file_exists($cacheFile)) {
         return $cacheFile;
     } else {
-        if ($fname = getFilenameForDate($displayDate,".jpg")) {
+        if ($fname = getFilenameForDate($displayDate, ".jpg")) {
             $source_gd_image = imagecreatefromjpeg($fname);
-        } else if ($fname = getFilenameForDate($displayDate,".png")) {
+        } else if ($fname = getFilenameForDate($displayDate, ".png")) {
             $source_gd_image = imagecreatefrompng($fname);
         } else {
             return false;
@@ -118,10 +122,6 @@
         }
         $source_image_width = imagesx($source_gd_image);
         $source_image_height = imagesy($source_gd_image);
-
-        $header_gd_image = imagecreatefrompng("img/header.png");
-        $header_image_width = imagesx($header_gd_image);
-        $header_image_height = imagesy($header_gd_image);
 
         $white = imagecolorallocate($source_gd_image, 255, 255, 255);
         $black = imagecolorallocate($source_gd_image, 0, 0, 0);
@@ -151,27 +151,23 @@
         $date = strtotime($displayDate);
 // First we create our bounding box for the first text
         $textDayName = date("l", $date);
-        $sizeDayName = 18;
+        $sizeDayName = 24 + round(($source_image_height - 1000) / 1000) * 2;
         $fontDayName = "./img/mplus-1p-medium.ttf";
         $bboxDayName = calculateTextBox($textDayName, $fontDayName, $sizeDayName);
 
         $textDate = date("jS F Y", $date);
-        $sizeDate = 14;
+        $sizeDate = 24 + floor(($source_image_height - 1000) / 100);
         $fontDate = "./img/mplus-1p-regular.ttf";
         $bboxDate = calculateTextBox($textDate, $fontDate, $sizeDate);
 
         $margin = 15;
-        $maxX = $header_image_width + $margin * 2 + max($bboxDayName['width'], $bboxDate['width']) + $margin * 2;
-        $maxY = max($header_image_height + $margin * 2, ($bboxDayName['height'] + $margin + $bboxDate['height']));
-
-// Draw a white rectangle
-        imagefilledrectangle($source_gd_image, 0, 0, $maxX, $maxY, $white);
-
-        imagecopy($source_gd_image, $header_gd_image, $margin, $margin, 0, 0, $header_image_width, $header_image_height);
+
+// Draw a black rectangle
+        imagefilledrectangle($source_gd_image, 0, 0, $source_image_width, $margin * 2 + $bboxDayName['height'], $black);
 
 // Write it
-        imagettftext($source_gd_image, $sizeDayName, 0, $header_image_width + $margin * 2 + $bboxDayName['left'], $margin + $bboxDayName['top'], $black, $fontDayName, $textDayName);
-        imagettftext($source_gd_image, $sizeDate, 0, $header_image_width + $margin * 2 + $bboxDate['left'], $margin + $bboxDayName['height'] + $margin + $bboxDate['top'], $black, $fontDate, $textDate);
+        imagettftext($source_gd_image, $sizeDayName, 0, $margin + $bboxDayName['left'], $margin + $bboxDayName['top'], $white, $fontDayName, $textDayName);
+        imagettftext($source_gd_image, $sizeDate, 0, (($source_image_width - $bboxDayName['width']) / 2) + $bboxDayName['width'] - $bboxDate['left'], + $margin + $bboxDate['top'], $white, $fontDate, $textDate);
 
         imagepng($source_gd_image, $cacheFile, 9);
         imagedestroy($source_gd_image);
@@ -212,6 +208,4 @@
     $length = strlen($needle);
     return (substr($haystack, 0, $length) === $needle);
 }
-
-
 ?>