diff options
| -rw-r--r-- | phpfspot.class.php | 119 |
1 files changed, 63 insertions, 56 deletions
diff --git a/phpfspot.class.php b/phpfspot.class.php index 89017e0..bfe4155 100644 --- a/phpfspot.class.php +++ b/phpfspot.class.php @@ -124,57 +124,60 @@ class PHPFSPOT { $this->tmpl->assign('current_condition', $_SESSION['tag_condition']); $this->tmpl->assign('template_path', 'themes/'. $this->cfg->theme_name); - $_SESSION['start_action'] = $_GET['mode']; + if(isset($_GET['mode'])) { - switch($_GET['mode']) { - case 'showpi': - if(isset($_GET['tags'])) { - $_SESSION['selected_tags'] = $this->extractTags($_GET['tags']); - } - 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']) && $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'] = $this->extractTags($_GET['tags']); - $_SESSION['start_action'] = 'showp'; - } - if(isset($_GET['id']) && is_numeric($_GET['id'])) { - $_SESSION['current_photo'] = $_GET['id']; - $_SESSION['start_action'] = 'showp'; - } - if(isset($_GET['from_date']) && $this->isValidDate($_GET['from_date'])) { - $_SESSION['from_date'] = strtotime($_GET['from_date']); - } - if(isset($_GET['to_date']) && $this->isValidDate($_GET['to_date'])) { - $_SESSION['to_date'] = strtotime($_GET['to_date']); - } - break; - case 'export': - $this->tmpl->show("export.tpl"); - return; - break; - case 'slideshow': - $this->tmpl->show("slideshow.tpl"); - return; - break; - case 'rss': - if(isset($_GET['tags'])) { - $_SESSION['selected_tags'] = $this->extractTags($_GET['tags']); - } - 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']) && $this->isValidDate($_GET['to_date'])) { - $_SESSION['to_date'] = strtotime($_GET['to_date'] ." 23:59:59"); - } - $this->getRSSFeed(); - return; - break; + $_SESSION['start_action'] = $_GET['mode']; + + switch($_GET['mode']) { + case 'showpi': + if(isset($_GET['tags'])) { + $_SESSION['selected_tags'] = $this->extractTags($_GET['tags']); + } + 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']) && $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'] = $this->extractTags($_GET['tags']); + $_SESSION['start_action'] = 'showp'; + } + if(isset($_GET['id']) && is_numeric($_GET['id'])) { + $_SESSION['current_photo'] = $_GET['id']; + $_SESSION['start_action'] = 'showp'; + } + if(isset($_GET['from_date']) && $this->isValidDate($_GET['from_date'])) { + $_SESSION['from_date'] = strtotime($_GET['from_date']); + } + if(isset($_GET['to_date']) && $this->isValidDate($_GET['to_date'])) { + $_SESSION['to_date'] = strtotime($_GET['to_date']); + } + break; + case 'export': + $this->tmpl->show("export.tpl"); + return; + break; + case 'slideshow': + $this->tmpl->show("slideshow.tpl"); + return; + break; + case 'rss': + if(isset($_GET['tags'])) { + $_SESSION['selected_tags'] = $this->extractTags($_GET['tags']); + } + 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']) && $this->isValidDate($_GET['to_date'])) { + $_SESSION['to_date'] = strtotime($_GET['to_date'] ." 23:59:59"); + } + $this->getRSSFeed(); + return; + break; + } } if(isset($_SESSION['from_date']) && isset($_SESSION['to_date'])) @@ -1627,19 +1630,23 @@ class PHPFSPOT { */ private function get_calendar($mode) { - $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"); + $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"); $output = "<input type=\"text\" size=\"3\" id=\"". $mode ."year\" value=\"". $year ."\""; - if(!isset($_SESSION[$mode .'_date'])) $output.= " disabled=\"disabled\""; + if(!isset($_SESSION[$mode .'_date'])) + $output.= " disabled=\"disabled\""; $output.= " />\n"; $output.= "<input type=\"text\" size=\"1\" id=\"". $mode ."month\" value=\"". $month ."\""; - if(!isset($_SESSION[$mode .'_date'])) $output.= " disabled=\"disabled\""; + if(!isset($_SESSION[$mode .'_date'])) + $output.= " disabled=\"disabled\""; $output.= " />\n"; $output.= "<input type=\"text\" size=\"1\" id=\"". $mode ."day\" value=\"". $day ."\""; - if(!isset($_SESSION[$mode .'_date'])) $output.= " disabled=\"disabled\""; + if(!isset($_SESSION[$mode .'_date'])) + $output.= " disabled=\"disabled\""; $output.= " />\n"; + return $output; } // get_calendar() |