From c2b94477b740ee563cc5e2a80cc641fd6c73318b Mon Sep 17 00:00:00 2001 From: Andreas Unterkircher Date: Sun, 8 Jun 2008 07:36:22 +0200 Subject: on-mouse-over of a tag in the available-tag-list, display amount of photos matching this tag Signed-off-by: Andreas Unterkircher --- phpfspot.class.php | 23 ++++++++++++++++++----- 1 file changed, 18 insertions(+), 5 deletions(-) diff --git a/phpfspot.class.php b/phpfspot.class.php index ae58790..303c355 100644 --- a/phpfspot.class.php +++ b/phpfspot.class.php @@ -840,6 +840,9 @@ class PHPFSPOT { // loop through our tag array foreach ($tags as $key => $value) { + /* has the currently processed tag already been added to + the selected tag list? if so, ignore it here... + */ if(isset($_SESSION['selected_tags']) && in_array($key, $_SESSION['selected_tags'])) continue; @@ -848,7 +851,7 @@ class PHPFSPOT { // multiply by the font-size increment ($size) // and add the $min_size set above $size = $min_size + (($value - $min_qty) * $step); - // uncomment if you want sizes in whole %: + // uncomment if you want sizes in whole %: $size = ceil($size); $color = $min_sat + ($value - $min_qty) * $step_sat; @@ -858,10 +861,20 @@ class PHPFSPOT { $b = '88'; if(isset($this->tags[$key])) { - if($this->is_user_friendly_url()) - $output.= "cfg->web_path ."/tag/". $key ."\" onclick=\"Tags('add', ". $key ."); return false;\" class=\"tag\" style=\"font-size: ". $size ."%; color: #". $r.$g.$b .";\">". $this->tags[$key] .", "; - else - $output.= "cfg->web_path ."/index.php?mode=showpi\" onclick=\"Tags('add', ". $key ."); return false;\" class=\"tag\" style=\"font-size: ". $size ."%; color: #". $r.$g.$b .";\">". $this->tags[$key] .", "; + if($this->is_user_friendly_url()) { + $output.= "cfg->web_path ."/tag/". $key ."\" + onclick=\"Tags('add', ". $key ."); return false;\" + class=\"tag\" + style=\"font-size: ". $size ."%; color: #". $r.$g.$b .";\" + title=\"Tag ". $this->tags[$key] .", ". $tags[$key] ." picture(s)\">". $this->tags[$key] .", "; + } + else { + $output.= "cfg->web_path ."/index.php?mode=showpi\" + onclick=\"Tags('add', ". $key ."); return false;\" + class=\"tag\" + style=\"font-size: ". $size ."%; color: #". $r.$g.$b .";\" + title=\"Tag ". $this->tags[$key] .", ". $tags[$key] ." picture(s)\">". $this->tags[$key] .", "; + } } } -- cgit v1.2.3-18-g5258 From ae5f579916f6395a466e9e134eafd7d3da66fae9 Mon Sep 17 00:00:00 2001 From: Andreas Unterkircher Date: Sun, 8 Jun 2008 08:59:50 +0200 Subject: update some source-code comments Signed-off-by: Andreas Unterkircher --- phpfspot.class.php | 40 +++++++++++++++++++++++++--------------- 1 file changed, 25 insertions(+), 15 deletions(-) diff --git a/phpfspot.class.php b/phpfspot.class.php index 303c355..39bace3 100644 --- a/phpfspot.class.php +++ b/phpfspot.class.php @@ -391,6 +391,11 @@ class PHPFSPOT { $this->avail_tags = Array(); $count = 0; + /* if show_tags has been set in the configuration (only show photos + which are tagged by these tags) they following will take care, + that only these other tags are displayed where the photo is also + tagged with one of show_tags. + */ if(isset($this->cfg->show_tags) && !empty($this->cfg->show_tags)) { $query_str=" SELECT @@ -458,6 +463,7 @@ class PHPFSPOT { */ public function get_photo_details($idx) { + /* ~ F-Spot version 0.3.x */ if($this->dbver < 9) { $query_str = " SELECT p.id, p.name, p.time, p.directory_path, p.description @@ -480,8 +486,8 @@ class PHPFSPOT { } } - /* if show_tags is set, only return details for photos which - are specified to be shown + /* if show_tags is set, only return details of photos which are + tagged with a tag that has been specified to be shown. */ if(isset($this->cfg->show_tags) && !empty($this->cfg->show_tags)) { $query_str.= " @@ -502,6 +508,9 @@ class PHPFSPOT { $row = $this->db->db_fetch_object($result); + /* before F-Spot db version 9 there was no uri column but seperated + columns for directory_path and name (= filename). + */ if($this->dbver < 9) { $row['uri'] = "file://". $row['directory_path'] ."/". $row['name']; } @@ -517,9 +526,10 @@ class PHPFSPOT { /** * returns aligned photo names * - * this function returns aligned (length) names for - * an specific photo. If the length of the name exceeds - * $limit the name will be shrinked (...) + * this function returns aligned (length) names for a specific photo. + * If the length of the name exceeds $limit the name will bei + * shrinked (...). + * * @param integer $idx * @param integer $limit * @return string|null @@ -540,11 +550,11 @@ class PHPFSPOT { /** * get photo rating level * - * this function will return the integer-based rating - * level of the photo. This can only be done, if the F-Spot - * database is at a specific level. If rating value can not - * be found, zero will be returned indicating no rating value - * is available. + * this function will return the integer-based rating level of a + * photo. This can only be done, if the F-Spot database is at a + * specific version. If rating value can not be found, zero will + * be returned indicating no rating value is available. + * * @param integer idx * @return integer */ @@ -562,8 +572,8 @@ class PHPFSPOT { /** * get rate-search bars * - * this function will return the rating-bars for the - * search field. + * this function will return the rating-bars for the search field. + * * @return string */ public function get_rate_search() @@ -609,9 +619,9 @@ class PHPFSPOT { /** * shrink text according provided limit * - * If the length of the name exceeds $limit the - * text will be shortend and some content in between - * will be replaced with "..." + * If the length of the name exceeds $limit, text will be shortend + * and inner content will be replaced with "...". + * * @param string $ext * @param integer $limit * @return string -- cgit v1.2.3-18-g5258 From 528046b591693d8bfa7fd2c042edb7800a191099 Mon Sep 17 00:00:00 2001 From: Andreas Unterkircher Date: Sun, 8 Jun 2008 09:35:47 +0200 Subject: issue124, also if rate-sort is set to DESC, 2nd-sort by photo-name should be ASC Signed-off-by: Andreas Unterkircher --- phpfspot.class.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/phpfspot.class.php b/phpfspot.class.php index 39bace3..d39356a 100644 --- a/phpfspot.class.php +++ b/phpfspot.class.php @@ -2748,7 +2748,7 @@ class PHPFSPOT { return " ORDER BY p.rating ASC, t.name ASC"; break; case 'rate_desc': - return " ORDER BY p.rating DESC, t.name DESC"; + return " ORDER BY p.rating DESC, t.name ASC"; break; } -- cgit v1.2.3-18-g5258