update milliways component to version found on live site, adding tags...

update milliways component to version found on live site, adding tags support(?) and sanitizing mwuri page titles before display

components/milliways.php

@@ -36,29 +36,27 @@ $smarty->assign("mwpath", $newpath);
 $cal = cal_info(CAL_JULIAN);
 
 if (strtolower($pathlist[$mwpath+1]) == "uri") {
+	$latest = FALSE;
 	$today = FALSE;
-	if (isset($pathlist[$mwpath+2]))
-		$today = strtotime($pathlist[$mwpath+2]);
-	if ($today === FALSE)
+	unset($search);
+	if (isset($pathlist[$mwpath+2])) {
+		if ($pathlist[$mwpath+2] == "search" && isset($pathlist[$mwpath+3]))  {
+			$search = $pathlist[$mwpath+3];
+
+		} else {
+			$today = strtotime($pathlist[$mwpath+2]);
+		}
+	}
+	if ($today === FALSE && !isset($search)) {
 		$today = time();
+		$latest = TRUE;
+	}
 
 	$smarty->assign("extra_scripts", array(
 		'<meta name="ROBOTS" content="NOINDEX" />',
 		'<meta name="ROBOTS" content="NOFOLLOW" />'));
 
 	$mwdb = new PDO('sqlite:/var/lib/mw/mwuri.db');
-	$res = $mwdb->prepare("select *, time(added,'localtime') as hour, date(added,'localtime') as day from mwuri where date(added,'localtime')=? order by added desc");
-	$res->execute(array(date("Y-m-d",$today)));
-	$data = $res->fetchAll(PDO::FETCH_ASSOC);
-	foreach($data as $k => $row)
-	{
-		if ($row['tags']) {
-			$json = json_decode($row['tags'], TRUE);
-			$data[$k]['taglist'] = $json[0]['top_tags'];
-		}
-	}
-	$smarty->assign("urilist", $data);
-
 	$res = $mwdb->prepare("select distinct strftime('%Y',added) from mwuri");
 	$res->execute();
 	$yearlist = $res->fetchAll(PDO::FETCH_COLUMN,0);
@@ -78,6 +76,34 @@ if (strtolower($pathlist[$mwpath+1]) == "uri") {
 	$daylist = $res->fetchAll(PDO::FETCH_COLUMN,0);
 	$smarty->assign("daylist",$daylist);
 
+	if ($today === FALSE && isset($search)) {
+		// do a search
+		$res = $mwdb->prepare("select *, time(added,'localtime') as hour, date(added,'localtime') as day from mwuri where title like ? or url like ? order by added desc");
+		$term = "%".$search."%";
+		$res->execute(array($term,$term));
+		$data = $res->fetchAll(PDO::FETCH_ASSOC);
+	} else {
+		//standard date based lookup
+		$res = $mwdb->prepare("select *, time(added,'localtime') as hour, date(added,'localtime') as day from mwuri where date(added,'localtime')=? order by added desc");
+		$res->execute(array(date("Y-m-d",$today)));
+		$data = $res->fetchAll(PDO::FETCH_ASSOC);
+		if ($latest && count($data == 0)) {
+			$day = end($yearlist)."-".end($monthlist)."-".end($daylist);
+			$today = strtotime($day);
+			$res->execute(array(date("Y-m-d",$today)));
+			$data = $res->fetchAll(PDO::FETCH_ASSOC);
+		}
+	}
+	foreach($data as $k => $row)
+	{
+		if ($row['tags']) {
+			$json = json_decode($row['tags'], TRUE);
+			if (is_array($json))
+				$data[$k]['taglist'] = $json[0]['top_tags'];
+		}
+	}
+	$smarty->assign("urilist", $data);
+
 	$smarty->assign("thisyear", date("Y",$today));
 	$smarty->assign("thismonth", date("m",$today));
 	$smarty->assign("thisday", date("d",$today));
@@ -209,12 +235,12 @@ $output .= print_r($pathlist, true);
 
 // summary lists
 $mwdb = new PDO('sqlite:/var/lib/mw/mwuri.db');
-$res = $mwdb->prepare("select *, time(added,'localtime') as hour, date(added,'localtime') as day from mwuri where date(added,'localtime')=? order by added desc limit 5");
-$res->execute(array(date("Y-m-d")));
+$res = $mwdb->prepare("select *, time(added,'localtime') as hour, date(added,'localtime') as day from mwuri order by added desc limit 5");
+$res->execute();
 $urilist = $res->fetchAll(PDO::FETCH_ASSOC);
 foreach ($urilist as $k=>$v) {
 	if ($v['title'] == "") $urilist[$k]['title']=$v['url'];
-	$urilist[$k]['title']=trim($urilist[$k]['title']);
+	$urilist[$k]['title']=filter_var(trim($urilist[$k]['title']),FILTER_SANITIZE_STRING, FILTER_FLAG_STRIP_HIGH | FILTER_FLAG_STRIP_LOW);
 }
 $smarty->assign("urilist", $urilist);