From 8996f568db6eb662e9bc54ffe2f6766d11429ee7 Mon Sep 17 00:00:00 2001 From: Andreas Unterkircher Date: Wed, 28 May 2008 06:30:32 +0200 Subject: issue122, use one text-field instead of 3 separated for year, month and date Signed-off-by: Andreas Unterkircher --- phpfspot.class.php | 49 ++++++++++++++++++++++++------------------------- phpfspot.js | 28 +++++++++++----------------- 2 files changed, 35 insertions(+), 42 deletions(-) diff --git a/phpfspot.class.php b/phpfspot.class.php index df984cb..797c604 100644 --- a/phpfspot.class.php +++ b/phpfspot.class.php @@ -344,8 +344,8 @@ class PHPFSPOT { } $this->tmpl->register_function("sort_select_list", array(&$this, "smarty_sort_select_list"), false); - $this->tmpl->assign('search_from_date', $this->get_calendar('from')); - $this->tmpl->assign('search_to_date', $this->get_calendar('to')); + $this->tmpl->assign('search_from_date', $this->get_date_text_field('from')); + $this->tmpl->assign('search_to_date', $this->get_date_text_field('to')); $this->tmpl->assign('preset_selected_tags', $this->getSelectedTags()); $this->tmpl->assign('preset_available_tags', $this->getAvailableTags()); @@ -2009,11 +2009,11 @@ class PHPFSPOT { public function startSearch() { /* date search */ - if(isset($_POST['from']) && $this->isValidDate($_POST['from'])) { - $from = $_POST['from']; + if(isset($_POST['date_from']) && $this->isValidDate($_POST['date_from'])) { + $date_from = $_POST['date_from']; } - if(isset($_POST['to']) && $this->isValidDate($_POST['to'])) { - $to = $_POST['to']; + if(isset($_POST['date_to']) && $this->isValidDate($_POST['date_to'])) { + $date_to = $_POST['date_to']; } /* tag-name search */ @@ -2049,13 +2049,13 @@ class PHPFSPOT { $this->get_tags(); - if(isset($from) && !empty($from)) - $_SESSION['from_date'] = strtotime($from ." 00:00:00"); + if(isset($date_from) && !empty($date_from)) + $_SESSION['from_date'] = strtotime($date_from ." 00:00:00"); else unset($_SESSION['from_date']); - if(isset($to) && !empty($to)) - $_SESSION['to_date'] = strtotime($to ." 23:59:59"); + if(isset($date_to) && !empty($date_to)) + $_SESSION['to_date'] = strtotime($date_to ." 23:59:59"); else unset($_SESSION['to_date']); @@ -2365,32 +2365,31 @@ class PHPFSPOT { } // _error() /** - * output calendard input fields + * get calendar input-text fields + * + * this function returns a text-field used for the data selection. + * Either it will be filled with the current date or, if available, + * filled with the date user entered previously. + * * @param string $mode * @return string */ - private function get_calendar($mode) + private function get_date_text_field($mode) { - $year = isset($_SESSION[$mode .'_date']) ? date("Y", $_SESSION[$mode .'_date']) : date("Y"); - $month = isset($_SESSION[$mode .'_date']) ? date("m", $_SESSION[$mode .'_date']) : date("m"); - $day = isset($_SESSION[$mode .'_date']) ? date("d", $_SESSION[$mode .'_date']) : date("d"); + $date = isset($_SESSION[$mode .'_date']) ? date("Y", $_SESSION[$mode .'_date']) : date("Y"); + $date.= "-"; + $date.= isset($_SESSION[$mode .'_date']) ? date("m", $_SESSION[$mode .'_date']) : date("m"); + $date.= "-"; + $date.= isset($_SESSION[$mode .'_date']) ? date("d", $_SESSION[$mode .'_date']) : date("d"); - $output = " Date: Sun, 1 Jun 2008 09:20:33 +0200 Subject: issue123, instead of using the Exif-Metadata-Time or mtime of the photo itself, rely on the F-Spot date in the photos-table (column time) Signed-off-by: Andreas Unterkircher --- phpfspot.class.php | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/phpfspot.class.php b/phpfspot.class.php index 797c604..2b5e180 100644 --- a/phpfspot.class.php +++ b/phpfspot.class.php @@ -719,7 +719,6 @@ class PHPFSPOT { $meta_res = $info[0] ."x". $info[1]; } - $meta_date = isset($meta['FileDateTime']) ? strftime("%a %x %X", $meta['FileDateTime']) : "n/a"; $meta_make = isset($meta['Make']) ? $meta['Make'] ." / ". $meta['Model'] : "n/a"; $meta_size = isset($meta['FileSize']) ? round($meta['FileSize']/1024, 1) ."kbyte" : "n/a"; @@ -747,7 +746,7 @@ class PHPFSPOT { $this->tmpl->assign('width', $info_thumb[0]); $this->tmpl->assign('height', $info_thumb[1]); - $this->tmpl->assign('ExifMadeOn', $meta_date); + $this->tmpl->assign('ExifMadeOn', strftime("%a %x %X", $details['time'])); $this->tmpl->assign('ExifMadeWith', $meta_make); $this->tmpl->assign('ExifOrigResolution', $meta_res); $this->tmpl->assign('ExifFileSize', $meta_size); @@ -2574,18 +2573,16 @@ class PHPFSPOT { $meta = $this->get_meta_informations($orig_path); } - $meta_date = isset($meta['FileDateTime']) ? $meta['FileDateTime'] : filemtime($orig_path); - ?> <?php print htmlspecialchars($this->parse_uri($details['uri'], 'filename')); ?> - + - + Date: Sun, 1 Jun 2008 09:25:38 +0200 Subject: add .gitignore to docs directory to ignore errors.html file Signed-off-by: Andreas Unterkircher --- docs/.gitignore | 1 + 1 file changed, 1 insertion(+) create mode 100644 docs/.gitignore diff --git a/docs/.gitignore b/docs/.gitignore new file mode 100644 index 0000000..9cddd86 --- /dev/null +++ b/docs/.gitignore @@ -0,0 +1 @@ +errors.html -- cgit v1.2.3-18-g5258 From 18efe997591ff832cd25c7008d4fab87c694242b Mon Sep 17 00:00:00 2001 From: Andreas Unterkircher Date: Sat, 7 Jun 2008 17:18:49 +0200 Subject: issue124, fix sort-order problem when sort by rating Signed-off-by: Andreas Unterkircher --- phpfspot.class.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/phpfspot.class.php b/phpfspot.class.php index 2b5e180..107ce4c 100644 --- a/phpfspot.class.php +++ b/phpfspot.class.php @@ -2722,10 +2722,10 @@ class PHPFSPOT { return " ORDER BY t.name DESC ,p.time ASC"; break; case 'rate_asc': - return " ORDER BY t.name ASC, p.rating ASC"; + return " ORDER BY p.rating ASC, t.name ASC"; break; case 'rate_desc': - return " ORDER BY t.name DESC, p.rating DESC"; + return " ORDER BY p.rating DESC, t.name DESC"; break; } -- cgit v1.2.3-18-g5258 From 903d4a4d67af041d623f128de85693b0ae7dbfb2 Mon Sep 17 00:00:00 2001 From: Andreas Unterkircher Date: Sat, 7 Jun 2008 17:09:54 +0200 Subject: increase version to 1.6 Signed-off-by: Andreas Unterkircher --- CHANGELOG | 11 +++++++++++ README | 2 +- phpfspot.class.php | 2 +- 3 files changed, 13 insertions(+), 2 deletions(-) diff --git a/CHANGELOG b/CHANGELOG index 12cd368..ca0bb1a 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,3 +1,14 @@ +phpfspot (1.6) + + * bug, sort-by rates if all photos of the library are displayed works now. + * bug, phpfspot used the image files last modification date instead of F-Spot's + recorded date when no EXIF data were available. Now it displays the same time as + F-Spot does. + * feature, date-input appears now as one field instead of seperates for year, month + and day. + + -- Andreas Unterkircher Sat, 25 May 2008 11:00:00 +0100 + phpfspot (1.5) * feature, user-friendly URL's (with Apache's mod_rewrite). diff --git a/README b/README index d00991e..48f9ae5 100644 --- a/README +++ b/README @@ -1,5 +1,5 @@ Package Name: phpfspot -Version: 1.5 +Version: 1.6 Author: Andreas Unterkircher Website: http://oss.netshadow.at Desc: dynamic PHP gallery for F-Spot diff --git a/phpfspot.class.php b/phpfspot.class.php index 107ce4c..ae58790 100644 --- a/phpfspot.class.php +++ b/phpfspot.class.php @@ -122,7 +122,7 @@ class PHPFSPOT { /* set application name and version information */ $this->cfg->product = "phpfspot"; - $this->cfg->version = "1.5"; + $this->cfg->version = "1.6"; $this->sort_orders= array( 'date_asc' => 'Date ↑', -- cgit v1.2.3-18-g5258