james/fembooru
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

popular_by_day/month/year should now work better with other date formats

Browse Source
This commit is contained in:
Daku 2012-01-30 23:57:30 +00:00
parent a590bf5e15
commit f76c0a4ff7
2 changed files with 11 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
contrib/numeric_score/main.php
View File

@ -109,26 +109,25 @@ class NumericScore implements Extension {
if($event->page_matches("popular_by_day") || $event->page_matches("popular_by_month") || $event->page_matches("popular_by_year")) { if($event->page_matches("popular_by_day") || $event->page_matches("popular_by_month") || $event->page_matches("popular_by_year")) {
$t_images = $config->get_int("index_height") * $config->get_int("index_width"); $t_images = $config->get_int("index_height") * $config->get_int("index_width");
//TODO: Somehow make popular_by_#/2012/12/31 > popular_by_#?day=31&month=12&year=2012 (So no problems with date formats)
//TODO: Add Popular_by_week. //TODO: Add Popular_by_week.
//year //year
if(int_escape($event->get_arg(0)) == 0){ if(empty($_GET['year'])){
$year = date("Y"); $year = date("Y");
}else{ }else{
$year = $event->get_arg(0); $year = $_GET['year'];
} }
//month //month
if(int_escape($event->get_arg(1)) == 0 || int_escape($event->get_arg(1)) > 12){ if(empty($_GET['month']) || int_escape($_GET['month']) > 12){
$month = date("m"); $month = date("m");
}else{ }else{
$month = $event->get_arg(1); $month = $_GET['month'];
} }
//day //day
if(int_escape($event->get_arg(2)) == 0 || int_escape($event->get_arg(2)) > 31){ if(empty($_GET['day']) || int_escape($_GET['day']) > 31){
$day = date("d"); $day = date("d");
}else{ }else{
$day = $event->get_arg(2); $day = $_GET['day'];
} }
$totaldate = $year."/".$month."/".$day; $totaldate = $year."/".$month."/".$day;
@ -150,7 +149,7 @@ class NumericScore implements Extension {
$sgra = array("month" => $month, "day" => $day); $sgra = array("month" => $month, "day" => $day);
$args = array_merge($agrs, $sgra); $args = array_merge($agrs, $sgra);
$dte = array($totaldate, date("F jS, Y", (strtotime($totaldate))), "Y/m/d", "day"); $dte = array($totaldate, date("F jS, Y", (strtotime($totaldate))), "\\y\\e\\a\\r\\=Y\\&\\m\\o\\n\\t\\h\\=m\\&\\d\\a\\y\\=d", "day");
} }
if($event->page_matches("popular_by_month")){ if($event->page_matches("popular_by_month")){
$sql .= $sql .=
@ -161,11 +160,11 @@ class NumericScore implements Extension {
$args = array_merge($agrs, $sgra); $args = array_merge($agrs, $sgra);
$title = date("F Y", (strtotime($totaldate))); $title = date("F Y", (strtotime($totaldate)));
$dte = array($totaldate, $title, "Y/m", "month"); $dte = array($totaldate, $title, "\\y\\e\\a\\r\\=Y\\&\\m\\o\\n\\t\\h\\=m", "month");
} }
if($event->page_matches("popular_by_year")){ if($event->page_matches("popular_by_year")){
$sql .= "AND NOT numeric_score=0"; $sql .= "AND NOT numeric_score=0";
$dte = array($totaldate, $year, "Y", "year"); $dte = array($totaldate, $year, "\y\e\a\\r\=Y", "year");
$args = $agrs; $args = $agrs;
} }
$sql .= " ORDER BY numeric_score DESC LIMIT :limit OFFSET 0"; $sql .= " ORDER BY numeric_score DESC LIMIT :limit OFFSET 0";

4
contrib/numeric_score/theme.php
View File

@ -67,8 +67,8 @@ class NumericScoreTheme extends Themelet {
'</span>'; '</span>';
} }
$b_dte = make_link("popular_by_".$dte[3]."/".date($dte[2], (strtotime('-1 '.$dte[3], strtotime($dte[0]))))); $b_dte = make_link("popular_by_".$dte[3]."?".date($dte[2], (strtotime('-1 '.$dte[3], strtotime($dte[0])))));
$f_dte = make_link("popular_by_".$dte[3]."/".date($dte[2], (strtotime('+1 '.$dte[3], strtotime($dte[0]))))); $f_dte = make_link("popular_by_".$dte[3]."?".date($dte[2], (strtotime('+1 '.$dte[3], strtotime($dte[0])))));
$html = '<center><h3><a href="'.$b_dte.'">&laquo;</a> '.$dte[1] $html = '<center><h3><a href="'.$b_dte.'">&laquo;</a> '.$dte[1]
.' <a href="'.$f_dte.'">&raquo;</a>' .' <a href="'.$f_dte.'">&raquo;</a>'