X-Git-Url: https://git.nubati.net/cgi-bin/gitweb.cgi?p=phpfspot.git;a=blobdiff_plain;f=phpfspot.class.php;h=b82fbeef01d5333f4d2477591c1a6e6f257ab4d5;hp=825f92d098d55a8e602ee8c16bd5cf027ac89b31;hb=b654689c263f6ce32c9d2ea01a3d04b2448532c3;hpb=75a329ec022ef21019afb17aecf776a10083e0cb diff --git a/phpfspot.class.php b/phpfspot.class.php index 825f92d..b82fbee 100644 --- a/phpfspot.class.php +++ b/phpfspot.class.php @@ -105,35 +105,36 @@ class PHPFSPOT { $this->tmpl->assign('searchfor', $_SESSION['searchfor']); $this->tmpl->assign('page_title', $this->cfg->page_title); $this->tmpl->assign('current_condition', $_SESSION['tag_condition']); + $this->tmpl->assign('template_path', 'themes/'. $this->cfg->theme_name); $_SESSION['start_action'] = $_GET['mode']; switch($_GET['mode']) { case 'showpi': if(isset($_GET['tags'])) { - $_SESSION['selected_tags'] = split(',', $_GET['tags']); + $_SESSION['selected_tags'] = $this->extractTags($_GET['tags']); } - if(isset($_GET['from_date'])) { - $_SESSION['from_date'] = $_GET['from_date']; + if(isset($_GET['from_date']) && $this->isValidDate($_GET['from_date'])) { + $_SESSION['from_date'] = strtotime($_GET['from_date'] ." 00:00:00"); } - if(isset($_GET['to_date'])) { - $_SESSION['to_date'] = $_GET['to_date']; + if(isset($_GET['to_date']) && $this->isValidDate($_GET['to_date'])) { + $_SESSION['to_date'] = strtotime($_GET['to_date'] ." 23:59:59"); } break; case 'showp': if(isset($_GET['tags'])) { - $_SESSION['selected_tags'] = split(',', $_GET['tags']); + $_SESSION['selected_tags'] = $this->extractTags($_GET['tags']); $_SESSION['start_action'] = 'showp'; } - if(isset($_GET['id'])) { + if(isset($_GET['id']) && is_numeric($_GET['id'])) { $_SESSION['current_photo'] = $_GET['id']; $_SESSION['start_action'] = 'showp'; } - if(isset($_GET['from_date'])) { - $_SESSION['from_date'] = $_GET['from_date']; + if(isset($_GET['from_date']) && $this->isValidDate($_GET['from_date'])) { + $_SESSION['from_date'] = strtotime($_GET['from_date']); } - if(isset($_GET['to_date'])) { - $_SESSION['to_date'] = $_GET['to_date']; + if(isset($_GET['to_date']) && $this->isValidDate($_GET['to_date'])) { + $_SESSION['to_date'] = strtotime($_GET['to_date']); } break; case 'export': @@ -146,14 +147,15 @@ class PHPFSPOT { break; } + if(isset($_SESSION['from_date']) && isset($_SESSION['to_date'])) + $this->tmpl->assign('date_search_enabled', true); + $this->tmpl->assign('from_date', $this->get_calendar('from')); $this->tmpl->assign('to_date', $this->get_calendar('to')); $this->tmpl->assign('sort_field', $this->get_sort_field()); $this->tmpl->assign('content_page', 'welcome.tpl'); - $this->tmpl->assign('template_path', 'themes/'. $this->cfg->theme_name); $this->tmpl->show("index.tpl"); - } // show() /** @@ -293,11 +295,11 @@ class PHPFSPOT { $thumb_path = $this->cfg->base_path ."/thumbs/". $this->cfg->photo_width ."_". $this->getMD5($photo); if(!file_exists($orig_path)) { - $this->_warning("Photo ". $orig_path ." does not exist!
\n"); + $this->_error("Photo ". $orig_path ." does not exist!
\n"); } if(!is_readable($orig_path)) { - $this->_warning("Photo ". $orig_path ." is not readable for user ". $this->getuid() ."
\n"); + $this->_error("Photo ". $orig_path ." is not readable for user ". $this->getuid() ."
\n"); } /* If the thumbnail doesn't exist yet, try to create it */ @@ -327,7 +329,7 @@ class PHPFSPOT { $extern_link.= "&tags=". $current_tags; } if(isset($_SESSION['from_date']) && isset($_SESSION['to_date'])) { - $extern_link.= "&from_date=". $_SESSION['from_date'] ."&to_date=". $_SESSION['to_date']; + $extern_link.= "&from_date=". $this->ts2str($_SESSION['from_date']) ."&to_date=". $this->ts2str($_SESSION['to_date']); } $this->tmpl->assign('extern_link', $extern_link); @@ -353,7 +355,7 @@ class PHPFSPOT { $this->tmpl->assign('current', $current); } else { - $this->_warning("Can't open file ". $thumb_path ."\n"); + $this->_error("Can't open file ". $thumb_path ."\n"); return; } @@ -564,8 +566,8 @@ class PHPFSPOT { $matched_photos = Array(); if(isset($_SESSION['from_date']) && isset($_SESSION['to_date'])) { - $from_date = strtotime($_SESSION['from_date']); - $to_date = strtotime($_SESSION['to_date']); + $from_date = $_SESSION['from_date']; + $to_date = $_SESSION['to_date']; $additional_where_cond = " p.time>='". $from_date ."' AND @@ -780,8 +782,8 @@ class PHPFSPOT { $this->tmpl->assign('searchfor', $_SESSION['searchfor']); if(isset($_SESSION['from_date']) && isset($_SESSION['to_date'])) { - $this->tmpl->assign('from_date', $_SESSION['from_date']); - $this->tmpl->assign('to_date', $_SESSION['to_date']); + $this->tmpl->assign('from_date', $this->ts2str($_SESSION['from_date'])); + $this->tmpl->assign('to_date', $this->ts2str($_SESSION['to_date'])); } if(isset($_SESSION['selected_tags']) && !empty($_SESSION['selected_tags'])) { @@ -818,7 +820,7 @@ class PHPFSPOT { for($i = 1; $i <= $last_page; $i++) { if($current_page == $i) - $style = "style=\"font-size: 125%;\""; + $style = "style=\"font-size: 125%; text-decoration: underline;\""; elseif($current_page-1 == $i || $current_page+1 == $i) $style = "style=\"font-size: 105%;\""; elseif(($current_page-5 >= $i) && ($i != 1) || @@ -873,7 +875,7 @@ class PHPFSPOT { $extern_link.= "&tags=". $current_tags; } if(isset($_SESSION['from_date']) && isset($_SESSION['to_date'])) { - $extern_link.= "&from_date=". $_SESSION['from_date'] ."&to_date=". $_SESSION['to_date']; + $extern_link.= "&from_date=". $this->ts2str($_SESSION['from_date']) ."&to_date=". $this->ts2str($_SESSION['to_date']); } $export_link = "index.php?mode=export"; @@ -1112,12 +1114,12 @@ class PHPFSPOT { $full_path = $this->translate_path($details['directory_path']) ."/". $details['name']; if(!file_exists($full_path)) { - $this->_warning("File ". $full_path ." does not exist\n"); + $this->_error("File ". $full_path ." does not exist\n"); return; } if(!is_readable($full_path)) { - $this->_warning("File ". $full_path ." is not readable for ". $this->getuid() ."\n"); + $this->_error("File ". $full_path ." is not readable for ". $this->getuid() ."\n"); return; } @@ -1210,12 +1212,18 @@ class PHPFSPOT { * getPhotoSelection() will then only return the matching * photos. */ - public function startSearch($searchfor, $from, $to, $sort_order) + public function startSearch($searchfor, $sort_order, $from = 0, $to = 0) { $_SESSION['searchfor'] = $searchfor; - $_SESSION['from_date'] = $from; - $_SESSION['to_date'] = $to; $_SESSION['sort_order'] = $sort_order; + if($from != 0) + $_SESSION['from_date'] = strtotime($from); + else + unset($_SESSION['from_date']); + if($to != 0) + $_SESSION['to_date'] = strtotime($to); + else + unset($_SESSION['to_date']); if($searchfor != "") { /* new search, reset the current selected tags */ @@ -1225,6 +1233,7 @@ class PHPFSPOT { array_push($_SESSION['selected_tags'], $tag); } } + } // startSearch() /** @@ -1411,21 +1420,31 @@ class PHPFSPOT { } // checkifImageSupported() - public function _warning($text) + public function _error($text) { - print "\"warning\"\n"; - print $text; + switch($this->cfg->logging) { + case 'display': + print "\"warning\"\n"; + print $text; + break; + case 'errorlog': + error_log($text); + break; + case 'logfile': + error_log($text, 3, $his->cfg->log_file); + break; + } - } // _warning() + } // _error() /** * output calendard input fields */ private function get_calendar($mode) { - $year = $_SESSION[$mode .'_date'] ? date("Y", strtotime($_SESSION[$mode .'_date'])) : date("Y"); - $month = $_SESSION[$mode .'_date'] ? date("m", strtotime($_SESSION[$mode .'_date'])) : date("m"); - $day = $_SESSION[$mode .'_date'] ? date("d", strtotime($_SESSION[$mode .'_date'])) : date("d"); + $year = $_SESSION[$mode .'_date'] ? date("Y", $_SESSION[$mode .'_date']) : date("Y"); + $month = $_SESSION[$mode .'_date'] ? date("m", $_SESSION[$mode .'_date']) : date("m"); + $day = $_SESSION[$mode .'_date'] ? date("d", $_SESSION[$mode .'_date']) : date("d"); $output = "\n"; + // "[%pictureurl% %thumbnailurl%]" + print htmlspecialchars("[".$orig_url." ".$thumb_url."&fake=1.jpg]") ."
\n"; + break; + + case 'MoinMoinList': + // " * [%pictureurl% %thumbnailurl%]" + print " " . htmlspecialchars("* [".$orig_url." ".$thumb_url."&fake=1.jpg]") ."
\n"; break; } @@ -1599,9 +1623,8 @@ class PHPFSPOT { if(isset($_SESSION['current_photo']) && $_SESSION['start_action'] == 'showp') { return "show_photo"; } - elseif((isset($_SESSION['selected_tags']) && !empty($_SESSION['selected_tags'])) || - (isset($_SESSION['from_date']) && isset($_SESSION['to_date']))) { - return "showpi"; + elseif(isset($_SESSION['selected_tags']) && !empty($_SESSION['selected_tags'])) { + return "showpi_tags"; } elseif(isset($_SESSION['start_action']) && $_SESSION['start_action'] == 'showpi') { return "showpi"; @@ -1666,6 +1689,12 @@ class PHPFSPOT { } // get_sort_order() + /*** + * return the next to be shown slide show image + * + * this function returns the URL of the next image + * in the slideshow sequence. + */ public function getNextSlideShowImage() { $all_photos = $this->getPhotoSelection(); @@ -1683,6 +1712,29 @@ class PHPFSPOT { } // getNextSlideShowImage() + /*** + * return the previous to be shown slide show image + * + * this function returns the URL of the previous image + * in the slideshow sequence. + */ + public function getPrevSlideShowImage() + { + $all_photos = $this->getPhotoSelection(); + + if(!isset($_SESSION['slideshow_img']) || $_SESSION['slideshow_img'] == 0) + $_SESSION['slideshow_img'] = 0; + else + $_SESSION['slideshow_img']--; + + $server_name = $_SERVER['SERVER_NAME']; + if(!isset($_SERVER['HTTPS'])) $protocol = "http"; + else $protocol = "https"; + + return $protocol ."://". $server_name . $this->cfg->web_path ."phpfspot_img.php?idx=". $all_photos[$_SESSION['slideshow_img']] ."&width=". $this->cfg->photo_width; + + } // getPrevSlideShowImage() + public function resetSlideShow() { if(isset($_SESSION['slideshow_img'])) @@ -1709,13 +1761,53 @@ class PHPFSPOT { "); while($row = $this->db->db_fetch_object($result)) { - array_push($all, $row[0]); + array_push($all, $row['id']); } - return array_rand($all); + return $all[array_rand($all)]; } // get_random_photo() + /** + * validates provided date + * + * this function validates if the provided date + * contains a valid date and will return true + * if it is. + */ + public function isValidDate($date_str) + { + $timestamp = strtotime($date_str); + + if(is_numeric($timestamp)) + return true; + + return false; + + } // isValidDate() + + /** + * timestamp to string conversion + */ + private function ts2str($timestamp) + { + return strftime("%Y-%m-%d", $timestamp); + } // ts2str() + + private function extractTags($tags_str) + { + $not_validated = split(',', $_GET['tags']); + $validated = array(); + + foreach($not_validated as $tag) { + if(is_numeric($tag)) + array_push($validated, $tag); + } + + return $validated; + + } // extractTags() + } ?>