You can subscribe to this list here.
2001 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
(149) |
Aug
(183) |
Sep
(113) |
Oct
(93) |
Nov
(126) |
Dec
(23) |
---|---|---|---|---|---|---|---|---|---|---|---|---|
2002 |
Jan
(29) |
Feb
(79) |
Mar
(72) |
Apr
(81) |
May
(240) |
Jun
(9) |
Jul
(33) |
Aug
(210) |
Sep
(267) |
Oct
(272) |
Nov
(296) |
Dec
(114) |
2003 |
Jan
(137) |
Feb
(204) |
Mar
(362) |
Apr
(252) |
May
(394) |
Jun
(507) |
Jul
(807) |
Aug
(1397) |
Sep
(1376) |
Oct
(1687) |
Nov
(1354) |
Dec
(587) |
2004 |
Jan
(653) |
Feb
(966) |
Mar
(929) |
Apr
(774) |
May
(757) |
Jun
(650) |
Jul
(1216) |
Aug
(1286) |
Sep
(980) |
Oct
(892) |
Nov
(905) |
Dec
(663) |
2005 |
Jan
(1013) |
Feb
(1129) |
Mar
(1928) |
Apr
(1218) |
May
(2883) |
Jun
(1684) |
Jul
(2325) |
Aug
(2931) |
Sep
(2002) |
Oct
(1297) |
Nov
(1368) |
Dec
(4965) |
2006 |
Jan
(3384) |
Feb
(2387) |
Mar
(2303) |
Apr
(853) |
May
(168) |
Jun
(174) |
Jul
(226) |
Aug
(303) |
Sep
(199) |
Oct
(375) |
Nov
(315) |
Dec
(282) |
2007 |
Jan
(145) |
Feb
(139) |
Mar
(301) |
Apr
(156) |
May
(123) |
Jun
(237) |
Jul
(83) |
Aug
(217) |
Sep
(52) |
Oct
(82) |
Nov
(62) |
Dec
(122) |
2008 |
Jan
(88) |
Feb
(68) |
Mar
(72) |
Apr
(29) |
May
(53) |
Jun
(27) |
Jul
(109) |
Aug
(167) |
Sep
(113) |
Oct
(342) |
Nov
(555) |
Dec
(558) |
2009 |
Jan
(414) |
Feb
(290) |
Mar
(289) |
Apr
(134) |
May
(319) |
Jun
(224) |
Jul
(199) |
Aug
(93) |
Sep
(271) |
Oct
(212) |
Nov
(163) |
Dec
(141) |
2010 |
Jan
(226) |
Feb
(150) |
Mar
(30) |
Apr
(34) |
May
(19) |
Jun
(134) |
Jul
(82) |
Aug
(106) |
Sep
(103) |
Oct
(29) |
Nov
(62) |
Dec
(73) |
2011 |
Jan
(208) |
Feb
(4) |
Mar
(36) |
Apr
(180) |
May
(41) |
Jun
(20) |
Jul
(18) |
Aug
(35) |
Sep
|
Oct
(14) |
Nov
(14) |
Dec
(11) |
2012 |
Jan
|
Feb
(11) |
Mar
(3) |
Apr
(28) |
May
(111) |
Jun
(34) |
Jul
(15) |
Aug
(5) |
Sep
(2) |
Oct
(8) |
Nov
(6) |
Dec
(28) |
2013 |
Jan
(145) |
Feb
(151) |
Mar
(177) |
Apr
(143) |
May
(140) |
Jun
(109) |
Jul
(23) |
Aug
(8) |
Sep
(5) |
Oct
|
Nov
|
Dec
|
2014 |
Jan
|
Feb
|
Mar
(2) |
Apr
|
May
(4) |
Jun
(1) |
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
2015 |
Jan
(1) |
Feb
|
Mar
|
Apr
(4) |
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
From: Bharat M. <bh...@us...> - 2001-07-22 07:04:20
|
Update of /cvsroot/gallery/gallery In directory usw-pr-cvs1:/tmp/cvs-serv11946 Modified Files: ChangeLog Log Message: * Fixed bug #443479 "invalid PHP function in functions.inc" fs_is_executable() was missing from platform/ files. Index: ChangeLog =================================================================== RCS file: /cvsroot/gallery/gallery/ChangeLog,v retrieving revision 1.88 retrieving revision 1.89 diff -u -r1.88 -r1.89 --- ChangeLog 2001/07/22 04:12:23 1.88 +++ ChangeLog 2001/07/22 07:04:17 1.89 @@ -1,3 +1,8 @@ +2001-07-22 Bharat Mediratta <bh...@me...> + + * Fixed bug #443479 "invalid PHP function in functions.inc" + fs_is_executable() was missing from platform/ files. + 2001-07-21 John Kirkland <jp...@bl...> * Added ability to statically sort photos by name via the @@ -27,7 +32,6 @@ * Fixed SF bug #439790. "Add photos and nested albums." - 2001-07-19 Bharat Mediratta <bh...@me...> * Added Album upgrade code. If you upgrade Gallery to a newer @@ -36,6 +40,7 @@ dialog that will walk you through a mostly automated process. 2001-07-19 John Kirkland <jp...@bl...> + * Replaced album shuffle with album sorting. This feature will allow album owners to sort their albums according to the file upload date or the Picture-Taken date. The |
From: Bharat M. <bh...@us...> - 2001-07-22 07:00:39
|
Update of /cvsroot/gallery/gallery/platform In directory usw-pr-cvs1:/tmp/cvs-serv10321 Modified Files: fs_unix.php fs_win32.php Log Message: Added fs_is_executable() Index: fs_unix.php =================================================================== RCS file: /cvsroot/gallery/gallery/platform/fs_unix.php,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- fs_unix.php 2001/07/18 20:19:21 1.3 +++ fs_unix.php 2001/07/22 07:00:36 1.4 @@ -63,6 +63,10 @@ return unlink($filename); } +function fs_is_executable($filename) { + return is_executable($filename); +} + function fs_import_filename($filename) { return $filename; } Index: fs_win32.php =================================================================== RCS file: /cvsroot/gallery/gallery/platform/fs_win32.php,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- fs_win32.php 2001/07/18 11:41:25 1.2 +++ fs_win32.php 2001/07/22 07:00:36 1.3 @@ -135,6 +135,10 @@ return export_filename(getenv("TEMP")); } +function fs_is_executable($filename) { + return eregi(".(exe|com)$", $filename); +} + function debug($msg) { if (0) { print "<br>$msg<br>"; |
From: John K. <joh...@us...> - 2001-07-22 04:35:36
|
Update of /cvsroot/gallery/gallery/classes In directory usw-pr-cvs1:/tmp/cvs-serv5160 Modified Files: AlbumDB.php Log Message: Fixed bug in numPhotos... Index: AlbumDB.php =================================================================== RCS file: /cvsroot/gallery/gallery/classes/AlbumDB.php,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- AlbumDB.php 2001/07/22 03:52:32 1.6 +++ AlbumDB.php 2001/07/22 04:35:33 1.7 @@ -109,13 +109,14 @@ function numPhotos($user) { $numPhotos = 0; - for ($i = 0; $i < sizeof($this->albumList); $i++) { - if ($this->albumList[$i]->canWrite($user->getUid())) { - $numPhotos += $this->albumList[$i]->numPhotos(1); - } else if ($this->albumList[$i]->canRead($user->getUid())) { - $numPhotos += $this->albumList[$i]->numPhotos(0); - } - } + foreach ($this->albumList as $album) { + if ($user->canWriteToAlbum($album)) { + $numPhotos += $album->numPhotos(1); + } else if ($user->canReadAlbum($album)) { + $numPhotos += $album->numPhotos(0); + } + } + return $numPhotos; } |
From: John K. <joh...@us...> - 2001-07-22 04:12:25
|
Update of /cvsroot/gallery/gallery In directory usw-pr-cvs1:/tmp/cvs-serv1057 Modified Files: ChangeLog view_album.php Log Message: Display "(hidden)" above the caption if you are viewing a hidden photo in the view_album display. This is SF feature #441336. Index: ChangeLog =================================================================== RCS file: /cvsroot/gallery/gallery/ChangeLog,v retrieving revision 1.87 retrieving revision 1.88 diff -u -r1.87 -r1.88 --- ChangeLog 2001/07/22 03:52:32 1.87 +++ ChangeLog 2001/07/22 04:12:23 1.88 @@ -17,6 +17,10 @@ of albums in the header of the main page. This is SF feature #438840. + * Display "(hidden)" above the caption if you are viewing a + hidden photo in the view_album display. This is SF feature + #441336. + 2001-07-19 John Kirkland <jp...@bl...> * Fixed SF bug #442881. "Extra </table> tag in search.php." Index: view_album.php =================================================================== RCS file: /cvsroot/gallery/gallery/view_album.php,v retrieving revision 1.75 retrieving revision 1.76 diff -u -r1.75 -r1.76 --- view_album.php 2001/07/20 04:45:17 1.75 +++ view_album.php 2001/07/22 04:12:23 1.76 @@ -347,6 +347,9 @@ echo("<form name='image_form_$i'>"); // put form outside caption to compress lines echo "<center><span class=\"caption\">"; $id = $gallery->album->getPhotoId($i); + if ($gallery->album->isHidden($i)) { + echo "(hidden)<br>"; + } if ($gallery->album->isAlbumName($i)) { $myAlbum = $albumDB->getAlbumbyName($gallery->album->isAlbumName($i)); $myDescription = $myAlbum->fields[description]; |
From: John K. <joh...@us...> - 2001-07-22 03:52:36
|
Update of /cvsroot/gallery/gallery In directory usw-pr-cvs1:/tmp/cvs-serv29781 Modified Files: ChangeLog albums.php Log Message: Display number of Photos in addition to number of albums in the header of the main page. This is SF feature #438840. Index: ChangeLog =================================================================== RCS file: /cvsroot/gallery/gallery/ChangeLog,v retrieving revision 1.86 retrieving revision 1.87 diff -u -r1.86 -r1.87 --- ChangeLog 2001/07/22 03:17:58 1.86 +++ ChangeLog 2001/07/22 03:52:32 1.87 @@ -13,6 +13,10 @@ files contained within the zip file. This is SF feature #423208. + * Display number of Photos in addition to number + of albums in the header of the main page. This is SF feature + #438840. + 2001-07-19 John Kirkland <jp...@bl...> * Fixed SF bug #442881. "Extra </table> tag in search.php." Index: albums.php =================================================================== RCS file: /cvsroot/gallery/gallery/albums.php,v retrieving revision 1.42 retrieving revision 1.43 diff -u -r1.42 -r1.43 --- albums.php 2001/07/19 08:21:02 1.42 +++ albums.php 2001/07/22 03:52:32 1.43 @@ -28,6 +28,7 @@ /* If there are albums in our list, display them in the table */ $numAlbums = $albumDB->numAlbums($gallery->user); +$numPhotos = $albumDB->numPhotos($gallery->user); if (!$gallery->session->albumListPage) { $gallery->session->albumListPage = 1; @@ -85,6 +86,7 @@ <? $adminText = "<span class=\"admin\">"; $adminText .= pluralize($numAlbums, "album", "no"); +$adminText .= ", " . pluralize($numPhotos, "photo", "no"); if ($maxPages > 1) { $adminText .= " on " . pluralize($maxPages, "page", "no") . " "; } |
From: John K. <joh...@us...> - 2001-07-22 03:52:36
|
Update of /cvsroot/gallery/gallery/classes In directory usw-pr-cvs1:/tmp/cvs-serv29781/classes Modified Files: AlbumDB.php Log Message: Display number of Photos in addition to number of albums in the header of the main page. This is SF feature #438840. Index: AlbumDB.php =================================================================== RCS file: /cvsroot/gallery/gallery/classes/AlbumDB.php,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- AlbumDB.php 2001/07/18 11:41:25 1.5 +++ AlbumDB.php 2001/07/22 03:52:32 1.6 @@ -106,6 +106,18 @@ function numAlbums($user) { return sizeof($this->getVisibleAlbums($user)); } + + function numPhotos($user) { + $numPhotos = 0; + for ($i = 0; $i < sizeof($this->albumList); $i++) { + if ($this->albumList[$i]->canWrite($user->getUid())) { + $numPhotos += $this->albumList[$i]->numPhotos(1); + } else if ($this->albumList[$i]->canRead($user->getUid())) { + $numPhotos += $this->albumList[$i]->numPhotos(0); + } + } + return $numPhotos; + } function getAlbum($user, $index) { $list = $this->getVisibleAlbums($user); |
From: John K. <joh...@us...> - 2001-07-22 03:18:01
|
Update of /cvsroot/gallery/gallery In directory usw-pr-cvs1:/tmp/cvs-serv22277 Modified Files: ChangeLog util.php Log Message: uploadDate and itemCaptureDate now set at file upload time. One benefit to this is... if you upload a zip file of photos, and you do not have exif data in the photos, the itemCaptureDate will be set to the time/date stamp of the files contained within the zip file. This is SF feature #423208. Index: ChangeLog =================================================================== RCS file: /cvsroot/gallery/gallery/ChangeLog,v retrieving revision 1.85 retrieving revision 1.86 diff -u -r1.85 -r1.86 --- ChangeLog 2001/07/21 16:57:08 1.85 +++ ChangeLog 2001/07/22 03:17:58 1.86 @@ -6,6 +6,13 @@ Ed Wilts <ew...@ew...> on our new Gallery-users mailing list. + * uploadDate and itemCaptureDate now set at file upload time. + One benefit to this is... if you upload a zip file of + photos, and you do not have exif data in the photos, the + itemCaptureDate will be set to the time/date stamp of the + files contained within the zip file. This is SF feature + #423208. + 2001-07-19 John Kirkland <jp...@bl...> * Fixed SF bug #442881. "Extra </table> tag in search.php." Index: util.php =================================================================== RCS file: /cvsroot/gallery/gallery/util.php,v retrieving revision 1.63 retrieving revision 1.64 diff -u -r1.63 -r1.64 --- util.php 2001/07/19 08:51:00 1.63 +++ util.php 2001/07/22 03:17:58 1.64 @@ -771,6 +771,71 @@ } } +function getExif($file) { + global $gallery; + + $return = array(); + $path = $gallery->app->use_exif; + exec("$path $file",$return); + while (list($key,$value) = each ($return)) { + $explodeReturn = explode(':', $value, 2); + $myExif[trim($explodeReturn[0])] = trim($explodeReturn[1]); + } + + return $myExif; +} + +function getItemCaptureDate($file) { + global $gallery; + + $success = 0; + if ($gallery->app->use_exif) { + $exifData = getExif($file); + if ($exifData["Date/Time"]) { + $success = 1; + $tempDate = split(" ", $exifData["Date/Time"], 2); + $tempDay = split(":" , $tempDate[0], 3); + $tempTime = split(":", $tempDate[1], 3); + $hours = "$tempTime[0]"; + $minutes = "$tempTime[1]"; + $seconds = "$tempTime[2]"; + $mday = "$tempDay[2]"; + $mon = "$tempDay[1]"; + $year = "$tempDay[0]"; + + $itemCaptureDate[hours] = $hours; + $itemCaptureDate[minutes] = $minutes; + $itemCaptureDate[seconds] = $seconds; + $itemCaptureDate[mday] = $mday; + $itemCaptureDate[mon] = $mon; + $itemCaptureDate[year] = $year; + } + } + if (!$success) { // we were not able to get the capture date from exif... use file creation time + $itemCaptureDate = getdate(filemtime($file)); + } + + // make sure everything (other than year) is 2 digits so we can do sorts with + // the resulting concatenated data i.e.: 20010708123412 + if (strlen($itemCaptureDate["mon"]) == 1) { + $itemCaptureDate["mon"] = "0" . $itemCaptureDate["mon"]; + } + if (strlen($itemCaptureDate["mday"]) == 1) { + $itemCaptureDate["mday"] = "0" . $itemCaptureDate["mday"]; + } + if (strlen($itemCaptureDate["hours"]) == 1) { + $itemCaptureDate["hours"] = "0" . $itemCaptureDate["hours"]; + } + if (strlen($itemCaptureDate["minutes"]) == 1) { + $itemCaptureDate["minutes"] = "0" . $itemCaptureDate["minutes"]; + } + if (strlen($itemCaptureDate["seconds"]) == 1) { + $itemCaptureDate["seconds"] = "0" . $itemCaptureDate["seconds"]; + } + print "IN UTIL ITEMCAPTUREDATE = $itemCaptureDate[year]<br>"; + return $itemCaptureDate; +} + function doCommand($command, $args="", $returnFile="", $returnArgs="") { global $GALLERY_EMBEDDED_INSIDE; global $GALLERY_MODULENAME; |
From: John K. <joh...@us...> - 2001-07-22 03:18:01
|
Update of /cvsroot/gallery/gallery/classes In directory usw-pr-cvs1:/tmp/cvs-serv22277/classes Modified Files: Album.php AlbumItem.php Log Message: uploadDate and itemCaptureDate now set at file upload time. One benefit to this is... if you upload a zip file of photos, and you do not have exif data in the photos, the itemCaptureDate will be set to the time/date stamp of the files contained within the zip file. This is SF feature #423208. Index: Album.php =================================================================== RCS file: /cvsroot/gallery/gallery/classes/Album.php,v retrieving revision 1.35 retrieving revision 1.36 diff -u -r1.35 -r1.36 --- Album.php 2001/07/21 16:57:08 1.35 +++ Album.php 2001/07/22 03:17:58 1.36 @@ -402,6 +402,10 @@ return $err; } else { $item->setCaption("$caption"); + $originalItemCaptureDate = getItemCaptureDate($file); + $now = time(); + $item->setItemCaptureDate($originalItemCaptureDate); + $item->setUploadDate($now); } $this->photos[] = $item; Index: AlbumItem.php =================================================================== RCS file: /cvsroot/gallery/gallery/classes/AlbumItem.php,v retrieving revision 1.21 retrieving revision 1.22 diff -u -r1.21 -r1.22 --- AlbumItem.php 2001/07/20 04:12:18 1.21 +++ AlbumItem.php 2001/07/22 03:17:58 1.22 @@ -71,53 +71,11 @@ // is available to us. First, look in the exif data if it is a jpeg file. If that // doesn't help us, then use the file creation date. $dir = $gallery->album->getAlbumDir(); - $success = 0; - if ($gallery->app->use_exif) { - $exifData = $this->getExif($dir); - if ($exifData["Date/Time"]) { - $success = 1; - $tempDate = split(" ", $exifData["Date/Time"], 2); - $tempDay = split(":" , $tempDate[0], 3); - $tempTime = split(":", $tempDate[1], 3); - $hours = "$tempTime[0]"; - $minutes = "$tempTime[1]"; - $seconds = "$tempTime[2]"; - $mday = "$tempDay[2]"; - $mon = "$tempDay[1]"; - $year = "$tempDay[0]"; - - $itemCaptureDate[hours] = $hours; - $itemCaptureDate[minutes] = $minutes; - $itemCaptureDate[seconds] = $seconds; - $itemCaptureDate[mday] = $mday; - $itemCaptureDate[mon] = $mon; - $itemCaptureDate[year] = $year; - } - } - if (!$success) { // we were not able to get the capture date from exif... use file creation time - $name = $this->image->name; - $tag = $this->image->type; - $file = "$dir/$name.$tag"; - $itemCaptureDate = getdate(filectime($file)); - } - } - // make sure everything (other than year) is 2 digits so we can do sorts with - // the resulting concatenated data i.e.: 20010708123412 - if (strlen($itemCaptureDate["mon"]) == 1) { - $itemCaptureDate["mon"] = "0" . $itemCaptureDate["mon"]; - } - if (strlen($itemCaptureDate["mday"]) == 1) { - $itemCaptureDate["mday"] = "0" . $itemCaptureDate["mday"]; - } - if (strlen($itemCaptureDate["hours"]) == 1) { - $itemCaptureDate["hours"] = "0" . $itemCaptureDate["hours"]; - } - if (strlen($itemCaptureDate["minutes"]) == 1) { - $itemCaptureDate["minutes"] = "0" . $itemCaptureDate["minutes"]; + $name = $this->image->name; + $tag = $this->image->type; + $file = "$dir/$name.$tag"; + $itemCaptureDate = getItemCaptureDate($file); } - if (strlen($itemCaptureDate["seconds"]) == 1) { - $itemCaptureDate["seconds"] = "0" . $itemCaptureDate["seconds"]; - } $this->itemCaptureDate = $itemCaptureDate; } @@ -132,17 +90,8 @@ } function getExif($dir) { - global $gallery; - - $return = array(); - $path = $gallery->app->use_exif; $file = $dir . "/" . $this->image->name . "." . $this->image->type; - exec("$path $file",$return); - while (list($key,$value) = each ($return)) { - $explodeReturn = explode(':', $value, 2); - $myExif[trim($explodeReturn[0])] = trim($explodeReturn[1]); - } - + $myExif = getExif($file); return $myExif; } |
From: John K. <joh...@us...> - 2001-07-21 16:57:14
|
Update of /cvsroot/gallery/gallery/classes In directory usw-pr-cvs1:/tmp/cvs-serv8830/classes Modified Files: Album.php Log Message: Added ability to statically sort photos by filename via the new sort feature. This feature was added based on discussion between Ken Frank <kf...@mn...> and Ed Wilts <ew...@ew...> on our new Gallery-users mailing list. Index: Album.php =================================================================== RCS file: /cvsroot/gallery/gallery/classes/Album.php,v retrieving revision 1.34 retrieving revision 1.35 diff -u -r1.34 -r1.35 --- Album.php 2001/07/20 04:12:18 1.34 +++ Album.php 2001/07/21 16:57:08 1.35 @@ -203,6 +203,24 @@ } else { $func .= "if (\$timeA > \$timeB) return -1; else return 1;"; } + } else if (!strcmp($sort, "filename")) { + $func = "\$objA = (object)\$a; \$objB = (object)\$b; "; + $func .= "if (\$objA->isAlbumName) { "; + $func .= " \$filenameA = \$objA->isAlbumName; "; + $func .= "} else { "; + $func .= " \$filenameA = \$objA->image->name; "; + $func .= "} "; + $func .= "if (\$objB->isAlbumName) { "; + $func .= " \$filenameB = \$objB->isAlbumName; "; + $func .= "} else { "; + $func .= " \$filenameB = \$objB->image->name; "; + $func .= "} "; + //$func .= "print \$filenameA \$filenameB; "; + if (!$order) { + $func .= "return (strcmp(\$filenameA, \$filenameB)); "; + } else { + $func .= "return (strcmp(\$filenameB, \$filenameA)); "; + } } usort($this->photos, create_function('$a,$b', $func)); |
From: John K. <joh...@us...> - 2001-07-21 16:57:14
|
Update of /cvsroot/gallery/gallery In directory usw-pr-cvs1:/tmp/cvs-serv8830 Modified Files: ChangeLog sort_album.php Log Message: Added ability to statically sort photos by filename via the new sort feature. This feature was added based on discussion between Ken Frank <kf...@mn...> and Ed Wilts <ew...@ew...> on our new Gallery-users mailing list. Index: ChangeLog =================================================================== RCS file: /cvsroot/gallery/gallery/ChangeLog,v retrieving revision 1.84 retrieving revision 1.85 diff -u -r1.84 -r1.85 --- ChangeLog 2001/07/20 04:45:17 1.84 +++ ChangeLog 2001/07/21 16:57:08 1.85 @@ -1,4 +1,12 @@ -2001-07-19 John Kirkland <jp...@bl...> +2001-07-21 John Kirkland <jp...@bl...> + + * Added ability to statically sort photos by name via the + new sort feature. This feature was added based on discussion + between Ken Frank <kf...@mn...> and + Ed Wilts <ew...@ew...> on our new Gallery-users mailing + list. + +2001-07-19 John Kirkland <jp...@bl...> * Fixed SF bug #442881. "Extra </table> tag in search.php." Index: sort_album.php =================================================================== RCS file: /cvsroot/gallery/gallery/sort_album.php,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sort_album.php 2001/07/19 06:48:13 1.2 +++ sort_album.php 2001/07/21 16:57:08 1.3 @@ -74,6 +74,9 @@ <td><input type="radio" name="sort" value="itemCapture"> By Picture-Taken Date</td> </tr> <tr> + <td><input type="radio" name="sort" value="filename"> By Filename</td> + </tr> + <tr> <td><input type="radio" name="sort" value="random"> Randomly</td> </tr> <tr> |
From: Bharat M. <bh...@us...> - 2001-07-21 01:05:08
|
Update of /cvsroot/gallery/CVSROOT In directory usw-pr-cvs1:/tmp/cvs-serv26646 Modified Files: cvswrappers Log Message: Added binary flags for .gif and .jpg files Index: cvswrappers =================================================================== RCS file: /cvsroot/gallery/CVSROOT/cvswrappers,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- cvswrappers 2000/06/20 02:12:58 1.1 +++ cvswrappers 2001/07/21 01:05:04 1.2 @@ -21,3 +21,5 @@ # and value is a single-quote delimited value. # For example: #*.gif -k 'b' +*.gif -k 'b' +*.jpg -k 'b' |
From: Chris S. <ch...@ja...> - 2001-07-20 15:00:58
|
Ahoy cvs watchers, This new branch 'skin-job-branch' will not be functional for a little while. The checkins I did last night are just part of an incremental checkin. Checking out against this branch is not recommended for the time being. I am planning on finishing the new development and merging it into the trunk near the end of next week. Have a nice day, chris |
From: Chris S. <jac...@us...> - 2001-07-20 08:51:30
|
Update of /cvsroot/gallery/gallery In directory usw-pr-cvs1:/tmp/cvs-serv8618 Modified Files: Tag: skin-job-branch view_photo.php Log Message: now uses the new default layout. This is still missing alot of functionality. Just an incremental checkin. Index: view_photo.php =================================================================== RCS file: /cvsroot/gallery/gallery/view_photo.php,v retrieving revision 1.65 retrieving revision 1.65.2.1 diff -u -r1.65 -r1.65.2.1 --- view_photo.php 2001/07/19 08:52:36 1.65 +++ view_photo.php 2001/07/20 08:51:26 1.65.2.1 @@ -18,30 +18,37 @@ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ ?> -<? require($GALLERY_BASEDIR . "init.php"); ?> -<? -// Hack check +<? + +require($GALLERY_BASEDIR . "init.php"); + +//------------------------------------------------------------------------- +//-- The Business section --- +// + +//-- Hack check. You have to have permission to see the album --- if (!$gallery->user->canReadAlbum($gallery->album)) { header("Location: albums.php"); return; } +//-- The AlbumItem ID --- if ($id) { $index = $gallery->album->getPhotoIndex($id); if ($index == -1) { - // That photo no longer exists. - header("Location: " . - $gallery->app->photoAlbumURL . - "/" . - $gallery->session->albumName); + // That photo no longer exists. Go back to the album + header("Location: " . $gallery->app->photoAlbumURL . + "/" . $gallery->session->albumName); return; } } else { + // We must have an index $id = $gallery->album->getPhotoId($index); } -$albumName = $gallery->session->albumName; + +//-- Increment the clickCount for this AlbumItem --- if (!$viewedItem[$gallery->session->albumName][$id]) { - setcookie("viewedItem[$albumName][$id]", "1"); + setcookie("viewedItem[$gallery->session->albumName][$id]", "1"); $gallery->album->incrementItemClicks($index); } @@ -51,7 +58,6 @@ } else { $image = $photo->image; } -$photoURL = $gallery->album->getAlbumDirURL() . "/" . $image->name . "." . $image->type; list($imageWidth, $imageHeight) = $image->getDimensions(); $do_fullOnly = !strcmp($gallery->session->fullOnly,"on") && @@ -59,421 +65,170 @@ if ($do_fullOnly) { $full = 1; } -$fitToWindow = !strcmp($gallery->album->fields["fit_to_window"], "yes") && !$gallery->album->isResized($index) && !$full; +$fitToWindow = !strcmp($gallery->album->fields["fit_to_window"], "yes") && + !$gallery->album->isResized($index) && !$full; -if ($full) { - $fullTag = "?full=1"; +$photoTag = $gallery->album->getPhotoTag($index, $full); +$photoUrl = $gallery->album->getPhotoPath($index, $full); + +if (!$gallery->album->isMovie($id)) { + if ($gallery->album->isResized($index) && !$do_fullOnly) { + if (!$full) { + $photoHref = makeGalleryUrl($gallery->session->albumName, $id, "full=1"); + } else { + $photoHref = makeGalleryUrl($gallery->session->albumName, $id); + } + } +} else { + //-- XXX - if a movie, slip in the target --- + $photoHref = $gallery->album->getPhotoPath($index)."\" target=\"other"; } +//-- in the fitToWindow case, wrap the photo with some JS --- +if ($fitToWindow && !$GALLERY_EMBEDDED_INSIDE) { + $photoTag = "<script language=\"javascript1.2\">" + ." // <!--" + ." fitToWindow();" + ." // -->" + ."</script><noscript>$photoTag</noscript>"; +} + $numPhotos = $gallery->album->numPhotos($gallery->user->canWriteToAlbum($gallery->album)); $next = $index+1; if ($next > $numPhotos) { //$next = 1; - $last = 1; + $last = 1; } $prev = $index-1; if ($prev <= 0) { //$prev = $numPhotos; - $first = 1; + $first = 1; } if ($index > $gallery->album->numPhotos(1)) { $index = $numPhotos; } - -/* - * We might be prev/next navigating using this page - * so recalculate the 'page' variable - */ -$rows = $gallery->album->fields["rows"]; -$cols = $gallery->album->fields["cols"]; -$perPage = $rows * $cols; -$page = ceil($index / ($rows * $cols)); - -/* - * Relative URLs are tricky if we don't know if we're rewriting - * URLs or not. If we're rewriting, then the browser will think - * we're down 1 dir farther than we really are. Use absolute - * urls wherever possible. - */ -$top = $gallery->app->photoAlbumURL; - -$bordercolor = $gallery->album -->fields["bordercolor"]; -$borderwidth = $gallery->album->fields["border"]; -if (!strcmp($borderwidth, "off")) { - $borderwidth = 1; -} -if (!strcmp($gallery->album->fields["resize_size"], "off")) { - $mainWidth = 0; -} else { - $mainWidth = $gallery->album->fields["resize_size"] + ($borderwidth*2); -} - -$navigator["id"] = $id; -$navigator["allIds"] = $gallery->album->getIds($gallery->user->canWriteToAlbum($gallery->album)); -$navigator["fullWidth"] = "100"; -$navigator["widthUnits"] = "%"; -$navigator["url"] = "."; -$navigator["bordercolor"] = $bordercolor; - -#-- breadcrumb text --- -if (strcmp($gallery->album->fields["returnto"], "no")) { - $breadtext[0] = "Gallery: <a href=" . makeGalleryUrl() . ">".$gallery->app->galleryTitle."</a>"; - $breadtext[1] = "Album: <a href=" . makeGalleryUrl($gallery->session->albumName, "", "page=$page") . ">".$gallery->album->fields["title"]."</a>"; -} else { - $breadtext[0] = "Album: <a href=" . makeGalleryUrl($gallery->session->albumName, "", "page=$page") . ">".$gallery->album->fields["title"]."</a>"; +$borderColor = $gallery->album->fields["bordercolor"]; +$borderWidth = $gallery->album->fields["border"]; +if (!strcmp($borderWidth, "off")) { + $borderWidth = 1; } -?> -<? if (!$GALLERY_EMBEDDED_INSIDE) { ?> -<head> - <title><?= $gallery->app->galleryTitle ?> :: <?= $gallery->album->fields["title"] ?> :: <?= $index ?></title> - <?= getStyleSheetLink() ?> - <style type="text/css"> -<? -// the link colors have to be done here to override the style sheet +//-- setup the album specific style sheet --- +$albumStyle = "<style type=\"text/css\">\n"; if ($gallery->album->fields["linkcolor"]) { -?> - A:link, A:visited, A:active - { color: <?= $gallery->album->fields[linkcolor] ?>; } - A:hover - { color: #ff6600; } -<? -} + $albumStyle .= + " A:link, A:visited, A:active\n" . + " { color: ".$gallery->album->fields[linkcolor]."; }\n" . + " A:hover\n" . + " { color: #ff6600; }\n"; +} if ($gallery->album->fields["bgcolor"]) { - echo "BODY { background-color:".$gallery->album->fields[bgcolor]."; }"; -} -if ($gallery->album->fields["background"]) { - echo "BODY { background-image:url(".$gallery->album->fields[background]."); } "; + $albumStyle .= + " BODY { background-color:".$gallery->album->fields[bgcolor]."; }\n"; } +if ($gallery->album->fields["background"]) { + $albumStyle .= + " BODY { background-image:url(".$gallery->album->fields[background].") ; }\n"; +} if ($gallery->album->fields["textcolor"]) { - echo "BODY, TD {color:".$gallery->album->fields[textcolor]."; }"; - echo ".head {color:".$gallery->album->fields[textcolor]."; }"; - echo ".headbox {background-color:".$gallery->album->fields[bgcolor]."; }"; -} -?> - </style> - <script language="javascript1.2"> - // <!-- - -<? -if ($fitToWindow) { -?> - - function fitToWindow(do_resize) { - var changed = 0; - var heightMargin = 160; - var widthMargin = 40; - var imageHeight = <?=$imageHeight?>; - var imageWidth = <?=$imageWidth?>; - var aspect = imageHeight / imageWidth; - - // Get the window dimensions height. IE and Nav use different techniques. - var windowWidth, windowHeight; - if (typeof(window.innerWidth) == "number") { - windowWidth = window.innerWidth; - windowHeight = window.innerHeight; - } else { - windowWidth = document.body.clientWidth; - windowHeight = document.body.clientHeight; - } - - // Leave a gutter around the edges - windowWidth = windowWidth - widthMargin; - windowHeight = windowHeight - heightMargin; - - var diffx = windowWidth - imageWidth, - diffy = windowHeight - imageHeight; - - if (diffx < 0 || diffy < 0) { - if (diffx < diffy) { - imageWidth = windowWidth; - imageHeight = aspect * imageWidth; - changed = 1; - } else { - imageHeight = windowHeight; - imageWidth = imageHeight / aspect; - changed = 1; - } - } - - if (do_resize) { - var img = document.images.photo; - img.height = imageHeight; - img.width = imageWidth; - } else { - if (changed) { - document.write('<a href="<?=makeGalleryUrl($gallery->session->albumName, $id, "full=1")?>">'); - } - document.write('<img name=photo src="<?=$photoURL?>" border=0 width=' + - imageWidth + ' height=' + imageHeight + '>'); - if (changed) { - document.write('</a>'); - } - } - } - - function doResize() { - if (document.all) { - // We're in IE where we can just resize the image. - fitToWindow(true); - } else { - // In Netscape we've got to reload the page. - document.reload(); - } - } - -<? -} // if ($fitToWindow) -?> - - // --> - </script> -</head> - -<? if ($fitToWindow) { ?> -<body onResize='doResize()'> -<? } else { ?> -<body> -<? } ?> -<? } # if not embedded ?> - -<? -includeHtmlWrap("photo.header"); -?> - -<!-- Top Nav Bar --> -<table border=0 width=<?=$mainWidth?> cellpadding=0 cellspacing=0> - -<tr> -<td> -<? - -if (!$gallery->album->isMovie($id)) { - if ($gallery->user->canWriteToAlbum($gallery->album)) { - $adminCommands .= '<a href="#" onClick="'. - popup("resize_photo.php?index=$index").';return false"><nobr>[resize photo]</nobr></a>'; - } - - if ($gallery->user->canDeleteFromAlbum($gallery->album)) { - $adminCommands .= '<a href="#" onClick="'. - popup("delete_photo.php?index=$index").';return false"><nobr>[delete photo]</nobr></a>'; - } - - if (!strcmp($gallery->album->fields["use_fullOnly"], "yes")) { - $link = doCommand("", "set_fullOnly=" . - (strcmp($gallery->session->fullOnly,"on") ? "on" : "off"), - "view_photo.php", "id=$id"); - $adminCommands .= "<nobr>View Images: [ "; - if (strcmp($gallery->session->fullOnly,"on")) - { - $adminCommands .= "normal | <a href=\"$link\">full</a> ]"; - } else { - $adminCommands .= "<a href=\"$link\">normal</a> | full ]"; - } - $adminCommands .= "</nobr>"; - } - - - if (!strcmp($gallery->album->fields["use_exif"],"yes") && (!strcmp($photo->image->type,"jpg")) && - ($gallery->app->use_exif)) { - $adminCommands .= "<a href=\"#\" onClick=\"". - popup("view_photo_properties.php?index=$index"). - "\">[photo properties]</a> "; - } - - - if (strcmp($gallery->album->fields["print_photos"],"none")) { - if (strlen($adminCommands) > 0) { - $adminCommands .="<br>"; - } - $adminCommands .= "<a href=# onClick=\"document.sflyc4p.returl.value=document.location; document.sflyc4p.submit();return false\">[print this photo on Shutterfly]</a>"; - } - - - if ($adminCommands) { - $adminCommands = "<span class=\"admin\">$adminCommands</span>"; - $adminbox["commands"] = $adminCommands; - $adminbox["text"] = " "; - - $adminbox["bordercolor"] = $bordercolor; - $adminbox["top"] = true; - include ($GALLERY_BASEDIR . "layout/adminbox.inc"); - } + $albumStyle .= + " BODY, TD {color:".$gallery->album->fields[textcolor]."; }\n" . + " .head {color:".$gallery->album->fields[textcolor]."; }\n" . + " .headbox {background-color:".$gallery->album->fields[bgcolor]."; }\n"; } +$albumStyle .= "</style>\n"; -$breadcrumb["text"] = $breadtext; -$breadcrumb["bordercolor"] = $bordercolor; -$breadcrumb["top"] = true; - -include($GALLERY_BASEDIR . "layout/breadcrumb.inc"); -?> -</td> -</tr> -<tr> -<td> -<? -include($GALLERY_BASEDIR . "layout/navphoto.inc"); - -#-- if borders are off, just make them the bgcolor ---- -if (!strcmp($gallery->album->fields["border"], "off")) { - $bordercolor = $gallery->album->fields["bgcolor"]; -} -if ($bordercolor) { - $bordercolor = "bgcolor=$bordercolor"; -} -?> -<br> -</td> -</tr> - - -</table> -<table border=0 width=<?=$mainWidth?> cellpadding=0 cellspacing=0> -<tr><td colspan=3> -<? -includeHtmlWrap("inline_photo.header"); -?> -</td></tr> -</table> - -<!-- image --> - -<table width=1% border=0 cellspacing=0 cellpadding=0> -<? -echo("<tr $bordercolor>"); -echo("<td colspan=3 height=$borderwidth><img src=$top/images/pixel_trans.gif></td>"); -echo("</tr><tr>"); -echo("<td $bordercolor width=$borderwidth>"); -echo("<img src=$top/images/pixel_trans.gif width=$borderwidth height=1>"); -echo("</td><td>"); -echo "<center>"; - -$photoTag = $gallery->album->getPhotoTag($index, $full); - -if (!$gallery->album->isMovie($id)) { - if ($gallery->album->isResized($index) && !$do_fullOnly) { - if ($full) { - echo "<a href=" . makeGalleryUrl($gallery->session->albumName, $id) . ">"; - } else { - echo "<a href=" . makeGalleryUrl($gallery->session->albumName, $id, "full=1") . ">"; - } - $openAnchor = 1; - } +if (!strcmp($gallery->album->fields["resize_size"], "off")) { + $mainWidth = imageWidth; } else { - echo "<a href=" . $gallery->album->getPhotoPath($index) . " target=other>"; - $openAnchor = 1; + $mainWidth = $gallery->album->fields["resize_size"]; } +$mainWidth += (borderWidth * 2); -if ($fitToWindow && !$GALLERY_EMBEDDED_INSIDE) { ?> -<script language="javascript1.2"> - // <!-- - fitToWindow(); - // --> -</script><noscript><? -} - -echo $photoTag; - -if ($fitToWindow) { - echo "</noscript>"; -} - -if ($openAnchor) { - echo "</a>"; - $openAnchor = 0; -} - -echo("</td>"); -echo("<td $bordercolor width=$borderwidth>"); -echo("<img src=$top/images/pixel_trans.gif width=$borderwidth height=1>"); -echo("</td>"); -echo("</tr>"); -echo("<tr $bordercolor>"); -echo("<td colspan=3 height=$borderwidth><img src=$top/images/pixel_trans.gif></td>"); -?> -</tr> -</table> - -<table border=0 width=<?=$mainWidth?> cellpadding=0 cellspacing=0> -<!-- caption --> -<tr> -<td colspan=3 align=center> -<span class="caption"><?= editCaption($gallery->album, $index, $edit) ?></span> -<br><br> -</td> -<!-- comments --> -<? if (!strcmp($gallery->album->fields["public_comments"], "yes")) { ?> -<tr> -<td colspan=3 align=center> -<span class="caption"><?= viewComments($index) ?></span> -<br><br> -</td> -</tr> -<? } ?> -<? -if (!strcmp($gallery->album->fields["print_photos"],"none") || - $gallery->album->isMovie($id)) { -} else { -$hostname = $GLOBALS["SERVER_NAME"]; -$protocol = "http"; -$photo = $gallery->album->getPhoto($GLOBALS["index"]); -$photoPath = $protocol . "://" . $hostname . $gallery->album->getAlbumDirURL(); -$rawImage = $photoPath . "/" . $photo->image->name . "." . $photo->image->type; - -$thumbImage= $photoPath . "/"; -if ($photo->image->resizedName) { - $thumbImage .= $photo->image->resizedName . "." . $photo->image->type; -} else { - $thumbImage .= $photo->image->name . "." . $photo->image->type; -} -list($imageWidth, $imageHeight) = $photo->image->getRawDimensions($gallery->album->getAlbumDir()); -?> -<form name="sflyc4p" action="http://www.shutterfly.com/c4p/UpdateCart.jsp" method="post"> - <input type=hidden name=addim value=1> - <input type=hidden name=protocol value="SFP,100"> - <input type=hidden name=pid value=C4P> - <input type=hidden name=psid value=AFFL> - <input type=hidden name=referid value=jackodog> - <input type=hidden name=returl value="this-gets-set-by-javascript-in-onClick"> - <input type=hidden name=imraw-1 value="<?= $rawImage ?>"> - <input type=hidden name=imrawheight-1 value="<?= $imageHeight ?>"> - <input type=hidden name=imrawwidth-1 value="<?= $imageWidth ?>"> - <input type=hidden name=imthumb-1 value="<?= $thumbImage ?>"> - <input type=hidden name=imbkprntb-1 value="Hi"> -</form> -<? -} -?> -</tr> - -<? - -includeHtmlWrap("inline_photo.footer"); -echo("</td></tr>"); -?> - -</table> -<table border=0 width=<?=$mainWidth?> cellpadding=0 cellspacing=0> -<tr> -<td> -<? -include($GALLERY_BASEDIR . "layout/navphoto.inc"); -$breadcrumb["top"] = false; -include($GALLERY_BASEDIR . "layout/breadcrumb.inc"); -?> -</td> -</tr> -</table> -</center> -<? -includeHtmlWrap("photo.footer"); -?> - -<? if (!$GALLERY_EMBEDDED_INSIDE) { ?> -</body> -</html> -<? } ?> +//------------------------------------------------------------------------- +//-- The Gallery Layout Object --- +// +require($GALLERY_BASEDIR . "layout.php"); // XXX move to init.php + +$GLO = array(); + +//-- the 'gallery' --- +$GLO['gallery']['title'] = $gallery->app->galleryTitle; +$GLO['gallery']['url'] = $gallery->app->photoAlbumURL; +$GLO['gallery']['styleSheetInclude'] = getStyleSheetLink(); + +//-- the 'album' --- +$GLO['album']['title'] = $gallery->album->fields['title']; +$GLO['album']['url'] = $gallery->album->getAlbumDirURL(); +$GLO['album']['name'] = $gallery->session->albumName; +$GLO['album']['styleSheetInclude'] = $albumStyle; +$GLO['album']['borderSize'] = $borderWidth; +$GLO['borderColor'] = $borderColor; + +//-- the 'item' is the focus of this page --- +$GLO['item']['id'] = $id; +$GLO['item']['index'] = $index; +$GLO['item']['caption'] = $gallery->album->getCaption($index); + +//-- the 'image' is the image that represents the 'item' --- +$GLO['image']['width'] = $imageWidth; +$GLO['image']['height'] = $imageHeight; +$GLO['image']['tableWidth'] = $mainWidth; +$GLO['image']['url'] = $photoURL; +$GLO['image']['tag'] = $photoTag; +$GLO['image']['href'] = $photoHref; + +//-- the 'boxTools' is the stuff that goes in the tool block --- +$toolCount = 1; +$GLO['toolbox']['tools'][$toolCount]['name'] = "Do This"; +$GLO['toolbox']['tools'][$toolCount]['href'] = "http://www.dothis.com"; +$toolCount++; +$GLO['toolbox']['tools'][$toolCount]['name'] = "Do That"; +$GLO['toolbox']['tools'][$toolCount]['href'] = "http://www.dothat.com"; +$toolCount++; +$GLO['toolbox']['tools'][$toolCount]['name'] = "Do The Other"; +$GLO['toolbox']['tools'][$toolCount]['href'] = "http://www.dotheother.com"; +$GLO['toolbox']['toolCount'] = $toolCount; + +//-- the 'boxBreadcrumb' is the stuff that goes in the breadcrums block --- + +//-- the 'boxNavigation' is the stuff that goes in the navigation block --- +$navIds = $gallery->album->getIds($gallery->user->canWriteToAlbum($gallery->album)); + +$navPageCount = sizeof($navIds); +$navpage = $navPageCount; +while ($navpage > 0) { // looking for the index among the 'visible' items + if (!strcmp($navIds[$navpage], $id)) { + break; + } + $navpage--; +} +$i_nav = 1; // pages are 1 based +foreach ($navIds as $navId) { + $GLO['navigator']['pages'][$i_nav]['name'] = $navId; + $GLO['navigator']['pages'][$i_nav]['href'] = + makeGalleryUrl($gallery->session->albumName, $navId); + $i_nav++; +} +$GLO['navigator']['pageNumber'] = $navpage + 1; // 1 based +$GLO['navigator']['pageCount'] = $navPageCount; +$GLO['navigator']['pageLabel'] = "Items"; + + +//-- the 'layout' relevant info --- +$GLO['layout']['dir'] = $GLO['gallery']['url'] . "/" . getLayoutFile(""); + +//-- some axtra useful stuff --- +$GLO['pixelImage'] = "<img src=\"" . $gallery->app->photoAlbumURL . + "/images/pixel_trans.gif\" width=\"1\" height=\"1\">"; + +//------------------------------------------------------------------------- +//-- The Layout of the Page --- +// +includeHtmlWrap("wrapper.header"); +includeLayout("view_item", $GLO); +includeHtmlWrap("wrapper.footer"); + |
From: Chris S. <jac...@us...> - 2001-07-20 08:49:14
|
Update of /cvsroot/gallery/gallery In directory usw-pr-cvs1:/tmp/cvs-serv8170 Modified Files: Tag: skin-job-branch util.php Log Message: makeGalleryURL now notices when an item is a nested album and does the right thing Index: util.php =================================================================== RCS file: /cvsroot/gallery/gallery/util.php,v retrieving revision 1.63 retrieving revision 1.63.2.1 diff -u -r1.63 -r1.63.2.1 --- util.php 2001/07/19 08:51:00 1.63 +++ util.php 2001/07/20 08:49:11 1.63.2.1 @@ -544,6 +544,15 @@ global $GALLERY_EMBEDDED_INSIDE; global $GALLERY_MODULENAME; + //-- If the Id points to a nested album --- + if ($photoId) { + $index = $gallery->album->getPhotoIndex($photoId); + if ($gallery->album->isAlbumName($index)) { + $albumName = $gallery->album->isAlbumName($index); + $photoId = ""; + } + } + switch ($GALLERY_EMBEDDED_INSIDE) { case "nuke": $url = "modules.php?op=modload&name=$GALLERY_MODULENAME&file=index"; |
From: Chris S. <jac...@us...> - 2001-07-20 08:47:43
|
Update of /cvsroot/gallery/gallery/layout_util/xtpl In directory usw-pr-cvs1:/tmp/cvs-serv7941 Added Files: Tag: skin-job-branch xtemplate.inc Log Message: checking in v0.3pre of XTemplate ***** Error reading new file[Errno 2] No such file or directory: 'xtemplate.inc' |
From: Chris S. <jac...@us...> - 2001-07-20 08:18:14
|
Update of /cvsroot/gallery/gallery/layout_util/xtpl In directory usw-pr-cvs1:/tmp/cvs-serv3044/xtpl Log Message: Directory /cvsroot/gallery/gallery/layout_util/xtpl added to the repository --> Using per-directory sticky tag `skin-job-branch' |
From: Chris S. <jac...@us...> - 2001-07-20 08:17:55
|
Update of /cvsroot/gallery/gallery/layout_util In directory usw-pr-cvs1:/tmp/cvs-serv2984/layout_util Log Message: Directory /cvsroot/gallery/gallery/layout_util added to the repository --> Using per-directory sticky tag `skin-job-branch' |
From: Chris S. <jac...@us...> - 2001-07-20 08:17:35
|
Update of /cvsroot/gallery/gallery In directory usw-pr-cvs1:/tmp/cvs-serv2929 Added Files: Tag: skin-job-branch layout.php Log Message: layout utility functions and stuff --- NEW FILE --- <? /* * Gallery - a web based photo album viewer and editor * Copyright (C) 2000 Bharat Mediratta * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 2 of the License, or (at * your option) any later version. * * This program is distributed in the hope that it will be useful, but * WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * General Public License for more details. * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ ?> <? require($GALLERY_BASEDIR . "layout_util/xtpl/xtemplate.inc"); //----------------------------------------------------------------------------- function includeLayout($name, $GLO) { // define these globals to make them available to layouts global $gallery; global $GLO; include (getLayoutFile("$name.inc")); return 1; } //----------------------------------------------------------------------------- function getLayoutFile($name) { global $gallery; $LAYOUT_DIR_NAME = "layout/"; //$layout = $gallery->layout; $layout = "default"; $layoutDir = $GALLERY_BASEDIR . $LAYOUT_DIR_NAME . $layout; return ($layoutDir . "/" . $name); } //----------------------------------------------------------------------------- //-- returns an initialized XTemplate object --- //----------------------------------------------------------------------------- function getLayoutXTemplate($name) { return new XTemplate(getLayoutFile($name)); } //----------------------------------------------------------------------------- //-- returns an initialized PSPCooker object --- //----------------------------------------------------------------------------- //require($GALLERY_BASEDIR . "layout_util/PSPCooker/class_pspcooker.php"); //function getLayoutPSPCooker($handle, $name) { // // $template = new PSPCooker($gallery->app->tmpDir); // $template->load_file($handle, getLayoutFile($name)); //} ?> |
From: Chris S. <jac...@us...> - 2001-07-20 08:15:40
|
Update of /cvsroot/gallery/gallery/layout/default/images In directory usw-pr-cvs1:/tmp/cvs-serv2610/default/images Added Files: Tag: skin-job-branch nav_dot.gif nav_dot_left.gif nav_dot_right.gif nav_first.gif nav_home.gif nav_last.gif nav_next.gif nav_page.gif nav_prev.gif Log Message: adding the makings of the first pluggable layout, called default --- NEW FILE --- GIF89a --- NEW FILE --- GIF89a --- NEW FILE --- GIF89a --- NEW FILE --- GIF89a --- NEW FILE --- GIF89a --- NEW FILE --- GIF89a --- NEW FILE --- GIF89aH --- NEW FILE --- GIF89a --- NEW FILE --- GIF89aH |
From: Chris S. <jac...@us...> - 2001-07-20 08:15:40
|
Update of /cvsroot/gallery/gallery/layout/default In directory usw-pr-cvs1:/tmp/cvs-serv2610/default Added Files: Tag: skin-job-branch blocks.xtpl header_footer.xtpl view_item.inc view_item.xtpl Log Message: adding the makings of the first pluggable layout, called default --- NEW FILE --- <!-- -------------------------------------------------------------------------------- -------------------------------------------------------------------------------- --> <!-- BEGIN: divider --> <table width="100%" border="0" cellspacing="0" cellpadding="0"> <tr> <td bgcolor="{GLO.borderColor}" width="1" height="1">{GLO.pixelImage}</td> </tr> </table> <!-- END: divider --> <!-- -------------------------------------------------------------------------------- -------------------------------------------------------------------------------- --> <!-- BEGIN: breadcrumb --> <table width="100%" border="0" cellspacing="0" cellpadding="0"> <tr> <td bgcolor="{GLO.borderColor}" width="1" height="18">{GLO.pixelImage}</td> <td align="center" valign="middle" width="3000" height="18">BREADCRUMB BAR HI</td> <td bgcolor="{GLO.borderColor}" width="1" height="18">{GLO.pixelImage}</td> </tr> </table> <!-- END: breadcrumb --> <!-- -------------------------------------------------------------------------------- -------------------------------------------------------------------------------- --> <!-- BEGIN: navigator --> <table width="100%" border="0" cellspacing="0" cellpadding="0"> <tr> <td bgcolor="{GLO.borderColor}" width="1" height="18">{GLO.pixelImage}</td> <!-- BEGIN: first --> <td align="center" width="27" height="18"> <a href="{page.href}"><img src="{GLO.layout.dir}images/nav_first.gif" border="0" width="27" height="11" alt="First ({page.name})"></a> </td> <td bgcolor="{GLO.borderColor}" width="1" height="1">{GLO.pixelImage}</td> <!-- END: first --> <!-- BEGIN: no_first --> <td align="center" width="27" height="18"> </td> <td width="1" height="1">{GLO.pixelImage}</td> <!-- END: no_first --> <!-- BEGIN: previous --> <td align="center" width="72" height="18"> <a href="{page.href}"><img src="{GLO.layout.dir}images/nav_prev.gif" border="0" width="72" height="11" alt="Previous ({page.name})"></a> </td> <td bgcolor="{GLO.borderColor}" width="1" height="1">{GLO.pixelImage}</td> <!-- END: previous --> <!-- BEGIN: no_previous --> <td align="center" width="72" height="18"> </td> <td width="1" height="1">{GLO.pixelImage}</td> <!-- END: no_previous --> <!-- BEGIN: pages --> <td width="3000" height="18" align="center"> <span class="nav"> {GLO.navigator.pageNumber} (of {GLO.navigator.pageCount} {GLO.navigator.pageLabel}) </span> </td> <!-- END: pages --> <!-- BEGIN: next --> <td bgcolor="{GLO.borderColor}" width="1" height="1">{GLO.pixelImage}</td> <td align="center" width="72" height="18"> <a href="{page.href}"><img src="{GLO.layout.dir}images/nav_next.gif" border="0" width="72" height="11" alt="Last ({page.name})"></a> </td> <!-- END: next --> <!-- BEGIN: no_next --> <td width="1" height="1">{GLO.pixelImage}</td> <td align="center" width="72" height="18"> </td> <!-- END: no_next --> <!-- BEGIN: last --> <td bgcolor="{GLO.borderColor}" width="1" height="1">{GLO.pixelImage}</td> <td align="center" width="27" height="18"> <a href="{page.href}"><img src="{GLO.layout.dir}images/nav_last.gif" border="0" width="27" height="11" alt="Last ({page.name})"></a> </td> <!-- END: last --> <!-- BEGIN: no_last --> <td width="1" height="1">{GLO.pixelImage}</td> <td align="center" width="27" height="18"> </td> <!-- END: no_last --> <td bgcolor="{GLO.borderColor}" width="1" height="18">{GLO.pixelImage}</td> </tr> </table> <!-- END: navigator --> <!-- -------------------------------------------------------------------------------- -------------------------------------------------------------------------------- --> <!-- BEGIN: toolbox --> <table width="100%" border="0" cellspacing="0" cellpadding="0"> <tr> <td bgcolor="{GLO.borderColor}" width="1" height="18">{GLO.pixelImage}</td> <!-- BEGIN: left --> <td align="left" valign="middle" width="3000" height="18"> toolbox</td> <!-- END: left --> <!-- BEGIN: tools --> <td align="right" valign="middle" width="3000" height="18"> <span class="admin"> <!-- BEGIN: tool --> <a href="{tool.href}">[{tool.name}]</a> <!-- END: tool --> </span> </td> <!-- END: tools --> <td bgcolor="{GLO.borderColor}" width="1" height="18">{GLO.pixelImage}</td> </tr> </table> <!-- END: toolbox --> --- NEW FILE --- <!-- -------------------------------------------------------------------- -------------------------------------------------------------------- --> <!-- BEGIN: header --> <!-- BEGIN: not_embedded_inside --> <html> <head> <title>{GLO.pagetitle}</title> {GLO.gallery.styleSheetInclude} {GLO.album.styleSheetInclude} {GLO.javascript.head} </head> <body {GLO.javascript.bodytag}> <!-- END: not_embedded_inside --> {GLO.javascript.body} THIS HEAD TEXT SHOWS UP ON EVERY GALLERY PAGE<br> <!-- END: header --> <!-----------------------------------------------------------------------> <!-- BEGIN: footer --> THIS FOOT TEXT SHOWS UP ON EVERY GALLERY PAGE<br> <!-- BEGIN: not_embedded_inside --> </body> </html> <!-- END: not_embedded_inside --> <!-- END: footer --> --- NEW FILE --- <? //------------------------------------------------------------------- //-- First assemble the pieces and dump them into the GLO structure //-- the blocks --- $xtpl_blocks = getLayoutXTemplate("blocks.xtpl"); $xtpl_blocks->assign('GLO', $GLO); //-- This divider goes between any of the blocks --- $xtpl_blocks->parse("divider"); //-- The navigator block --- if ($GLO['navigator']['pageNumber'] > 1) { $xtpl_blocks->assign('page', $GLO['navigator']['pages'][1]); $xtpl_blocks->parse("navigator.first"); $xtpl_blocks->assign('page', $GLO['navigator']['pages'][$GLO['navigator']['pageNumber']-1]); $xtpl_blocks->parse("navigator.previous"); } else { $xtpl_blocks->parse("navigator.no_first"); $xtpl_blocks->parse("navigator.no_previous"); } $xtpl_blocks->parse("navigator.pages"); if ($GLO['navigator']['pageNumber'] < $GLO['navigator']['pageCount']) { $xtpl_blocks->assign('page', $GLO['navigator']['pages'][$GLO['navigator']['pageNumber']+1]); $xtpl_blocks->parse("navigator.next"); $xtpl_blocks->assign('page', $GLO['navigator']['pages'][$GLO['navigator']['pageCount']]); $xtpl_blocks->parse("navigator.last"); } else { $xtpl_blocks->parse("navigator.no_next"); $xtpl_blocks->parse("navigator.no_last"); } $xtpl_blocks->parse("navigator"); //$xtpl_blocks->parse("toolbox.left"); if ($GLO['toolbox']['toolCount'] > 0) { for ($i=1; $i <= $GLO['toolbox']['toolCount']; $i++) { $xtpl_blocks->assign("tool", $GLO['toolbox']['tools'][$i]); $xtpl_blocks->parse("toolbox.tools.tool"); } $xtpl_blocks->parse("toolbox.tools"); } $xtpl_blocks->parse("toolbox"); $xtpl_blocks->parse("breadcrumb"); $GLO['divider'] = $xtpl_blocks->text("divider"); $GLO['blockNavigation'] = $xtpl_blocks->text("navigator"); $GLO['blockTools'] = $xtpl_blocks->text("toolbox"); $GLO['blockBreadcrumb'] = $xtpl_blocks->text("breadcrumb"); //------------------------------------------------------------------- //-- The gallerywide headers and footers --- //-- modify page title here as the title tag is in global template --- $GLO['pagetitle'] = $GLO['gallery']['title'] . " :: " . $GLO['album']['title'] . " :: " . $GLO['item']['id']; $xtpl_hf = getLayoutXTemplate("header_footer.xtpl"); $xtpl_hf->assign('GLO', $GLO); if (!$GALLERY_EMBEDDED_INSIDE) { $xtpl_hf->parse("header.not_embedded_inside"); $xtpl_hf->parse("footer.not_embedded_inside"); } $xtpl_hf->parse("header"); $xtpl_hf->parse("footer"); $GLO['header'] = $xtpl_hf->text("header"); $GLO['footer'] = $xtpl_hf->text("footer"); //------------------------------------------------------------------- //-- Finally do the main template --- //-- Note: only parse the header/footer if we are not embedded. $xtpl = getLayoutXTemplate("view_item.xtpl"); $xtpl->assign('GLO', $GLO); $xtpl->parse("view_photo"); $xtpl->out("view_photo"); ?> --- NEW FILE --- <!-- BEGIN: view_photo --> {GLO.header} <table border="0" width="{GLO.image.tableWidth}" cellpadding="0" cellspacing="0"> <tr> <td> {GLO.divider} {GLO.blockTools} {GLO.divider} {GLO.blockBreadcrumb} {GLO.divider} {GLO.blockNavigation} {GLO.divider} </td> </tr> <tr> <td align=center> <br> <table width="1%" border="0" cellspacing="0" cellpadding="0"> <tr bgcolor="{GLO.borderColor}"> <td colspan=3 height="{GLO.album.borderSize}">{GLO.pixelImage}</td> </tr> <tr> <td bgcolor="{GLO.borderColor}" width="{GLO.album.borderSize}">{GLO.pixelImage}</td> <td><a href="{GLO.image.href}">{GLO.image.tag}</a></td> <td bgcolor="{GLO.borderColor}" width="{GLO.album.borderSize}">{GLO.pixelImage}</td> </tr> <tr bgcolor="{GLO.borderColor}"> <td colspan=3 height="{GLO.album.borderSize}">{GLO.pixelImage}</td> </tr> <tr> <td colspan="3" align="center"> <span class="caption">{GLO.item.caption}</span> </td> </tr> </table> <br> </td> </tr> <tr> <td> {GLO.divider} {GLO.blockNavigation} {GLO.divider} {GLO.blockBreadcrumb} {GLO.divider} </td> </tr> </table> {GLO.footer} <!-- END: view_photo --> |
From: Chris S. <jac...@us...> - 2001-07-20 08:14:17
|
Update of /cvsroot/gallery/gallery/layout/default/images In directory usw-pr-cvs1:/tmp/cvs-serv2371/images Log Message: Directory /cvsroot/gallery/gallery/layout/default/images added to the repository --> Using per-directory sticky tag `skin-job-branch' |
From: Chris S. <jac...@us...> - 2001-07-20 08:13:54
|
Update of /cvsroot/gallery/gallery/layout/default In directory usw-pr-cvs1:/tmp/cvs-serv2285/default Log Message: Directory /cvsroot/gallery/gallery/layout/default added to the repository --> Using per-directory sticky tag `skin-job-branch' |
From: John K. <joh...@us...> - 2001-07-20 04:45:20
|
Update of /cvsroot/gallery/gallery In directory usw-pr-cvs1:/tmp/cvs-serv30355 Modified Files: ChangeLog view_album.php Log Message: Fixed SF bug #439790 . Add photos and nested albums. Index: ChangeLog =================================================================== RCS file: /cvsroot/gallery/gallery/ChangeLog,v retrieving revision 1.83 retrieving revision 1.84 diff -u -r1.83 -r1.84 --- ChangeLog 2001/07/20 04:30:44 1.83 +++ ChangeLog 2001/07/20 04:45:17 1.84 @@ -1,6 +1,8 @@ 2001-07-19 John Kirkland <jp...@bl...> - * Fixed SF bug #442881. Extra </table> tag in search.php. + * Fixed SF bug #442881. "Extra </table> tag in search.php." + + * Fixed SF bug #439790. "Add photos and nested albums." 2001-07-19 Bharat Mediratta <bh...@me...> Index: view_album.php =================================================================== RCS file: /cvsroot/gallery/gallery/view_album.php,v retrieving revision 1.74 retrieving revision 1.75 diff -u -r1.74 -r1.75 --- view_album.php 2001/07/19 06:29:10 1.74 +++ view_album.php 2001/07/20 04:45:17 1.75 @@ -188,6 +188,8 @@ if ($gallery->user->canAddToAlbum($gallery->album)) { $adminCommands .= '<a href="#" onClick="'.popup("add_photos.php?albumName=" . $gallery->session->albumName).'">[add photos]</a> '; +} +if ($gallery->user->canCreateAlbums()) { $adminCommands .= '<a href="' . doCommand("new-album", "&parentName=" . $gallery->session->albumName, "view_album.php") . |
From: John K. <joh...@us...> - 2001-07-20 04:30:47
|
Update of /cvsroot/gallery/gallery In directory usw-pr-cvs1:/tmp/cvs-serv28173 Modified Files: ChangeLog search.php Log Message: Fixed SF bug #442881. Deleted extra </table> tag. Index: ChangeLog =================================================================== RCS file: /cvsroot/gallery/gallery/ChangeLog,v retrieving revision 1.82 retrieving revision 1.83 diff -u -r1.82 -r1.83 --- ChangeLog 2001/07/19 08:30:40 1.82 +++ ChangeLog 2001/07/20 04:30:44 1.83 @@ -1,3 +1,8 @@ +2001-07-19 John Kirkland <jp...@bl...> + + * Fixed SF bug #442881. Extra </table> tag in search.php. + + 2001-07-19 Bharat Mediratta <bh...@me...> * Added Album upgrade code. If you upgrade Gallery to a newer Index: search.php =================================================================== RCS file: /cvsroot/gallery/gallery/search.php,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- search.php 2001/07/13 05:17:19 1.8 +++ search.php 2001/07/20 04:30:44 1.9 @@ -48,7 +48,7 @@ </td> </form> </tr> -<tr><td height=2><img src=<?= $GALLERY_BASEDIR ?>images/pixel_trans.gif></td></tr></table> +<tr><td height=2><img src=<?= $GALLERY_BASEDIR ?>images/pixel_trans.gif></td></tr> </table> <? } |
From: Chris S. <jac...@us...> - 2001-07-20 04:12:21
|
Update of /cvsroot/gallery/gallery/classes In directory usw-pr-cvs1:/tmp/cvs-serv25953 Modified Files: Album.php AlbumItem.php Log Message: Added optional full parameter to getPhotoPath. Not gonna say why :) Index: Album.php =================================================================== RCS file: /cvsroot/gallery/gallery/classes/Album.php,v retrieving revision 1.33 retrieving revision 1.34 diff -u -r1.33 -r1.34 --- Album.php 2001/07/19 14:30:13 1.33 +++ Album.php 2001/07/20 04:12:18 1.34 @@ -475,9 +475,9 @@ } } - function getPhotoPath($index) { + function getPhotoPath($index, $full=0) { $photo = $this->getPhoto($index); - return $photo->getPhotoPath($this->getAlbumDirURL()); + return $photo->getPhotoPath($this->getAlbumDirURL(), $full); } function getPhotoId($index) { Index: AlbumItem.php =================================================================== RCS file: /cvsroot/gallery/gallery/classes/AlbumItem.php,v retrieving revision 1.20 retrieving revision 1.21 diff -u -r1.20 -r1.21 --- AlbumItem.php 2001/07/19 06:29:10 1.20 +++ AlbumItem.php 2001/07/20 04:12:18 1.21 @@ -440,9 +440,9 @@ } } - function getPhotoPath($dir) { + function getPhotoPath($dir, $full=0) { if ($this->image) { - return $this->image->getPath($dir); + return $this->image->getPath($dir, $full); } else { return "about:blank"; } |