app/spyc.php
content/2008/06/29/1214718883
content/2008/06/29/1214718999
content/2008/06/29/1214719018
@@ -1,2 +1,17 @@
password: secret
your_name: Trey Piepmeier
+
+ext: ".markdown"
+month_names:
+ 1: January
+ 2: February
+ 3: March
+ 4: April
+ 5: May
+ 6: June
+ 7: July
+ 8: August
+ 9: September
+ 10: October
+ 11: November
+ 12: December
app/config.yaml
@@ -3,39 +3,31 @@
define('APP_DIR', dirname(__FILE__).'/');
define('PUBLIC_DIR', dirname(__FILE__).'/../public/');
define('CONTENT_DIR', dirname(__FILE__).'/../content/');
-define('EXT', '.markdown');
-$month_names_en = array(
- '1' => 'January',
- '2' => 'February',
- '3' => 'March',
- '4' => 'April',
- '5' => 'May',
- '6' => 'June',
- '7' => 'July',
- '8' => 'August',
- '9' => 'September',
- '10' => 'October',
- '11' => 'November',
- '12' => 'December'
- );
+require_once(APP_DIR.'spyc.php');
+$config = Spyc::YAMLLoad(APP_DIR.'config.yaml');
require_once('markdown.php');
foreach(scandir(CONTENT_DIR) as $year) {
$year_dir = CONTENT_DIR.$year;
- if(is_dir($year_dir) && preg_match("/\d\d\d\d/", $year)) {
+ if(preg_match("/\d\d\d\d/", $year) && is_dir($year_dir)) {
$months = array();
- foreach(scandir(CONTENT_DIR.$year) as $month) {
+ foreach(scandir($year_dir) as $month) {
$month_dir = $year_dir.'/'.$month;
- if(is_dir($month_dir) && preg_match("/\d\d/", $month)) {
+ if(preg_match("/\d\d/", $month) && is_dir($month_dir)) {
$days = array();
- foreach(scandir(CONTENT_DIR.$year.'/'.$month) as $file) {
- $day = str_replace(EXT, '', $file);
- $file_path = $month_dir.'/'.$file;
- $date = "$year-$month-$day";
- if(is_file($file_path) && preg_match("/\d\d/", $day)) {
- $days[$day] = $date;
+ foreach(scandir($month_dir) as $day) {
+ $day_dir = $month_dir.'/'.$day;
+ if(preg_match("/\d\d/", $day) && is_dir($day_dir)) {
+ $entries = array();
+ foreach(scandir($day_dir) as $entry) {
+ $entry_path = $day_dir.'/'.$entry;
+ if(is_file($entry_path) && preg_match("/^\d{10,}$/", $entry)) {
+ $entries[$entry] = $entry_path;
+ }
+ }
+ $days[$day] = $entries;
}
}
$months[$month] = $days;
@@ -47,38 +39,28 @@ foreach(scandir(CONTENT_DIR) as $year) {
// FUNCTIONS
function get_month($month_number) {
- global $month_names_en;
- return $month_names_en[ltrim($month_number, '0')];
+ global $config;
+ return $config['month_names'][ltrim($month_number, '0')];
}
-function get_entry() {
- if(isset($_GET['date'])) {
- if(!preg_match("/\d\d\d\d\-\d\d\-\d\d/", $date) === false) {
- return "No Entry Found";
+function get_entries($date) {
+ global $config;
+ global $years;
+ if(empty($date)) {
+ return "Please choose and entry.";
+ } else {
+ if(preg_match("/\d{4}-\d{2}-\d{2}/", $date) == 0) {
+ return "<h1>Invalid Date</h1>";
} else {
- $date_parts = explode('-', $_GET['date']);
-
- $filelist = array();
- $content = "<ul>\n";
- $url = $date_parts[0] . '/' . $date_parts[1] . '/' . $date_parts[2];
- $dir = opendir(CONTENT_DIR . $url);
- while ($file = readdir($dir)) {
- if ( $file{0} == "." )
- continue;
- $file = preg_replace('/(.*?)\.markdown/', '<a href="/' . $url . '/\\1">\\1</a>', $file);
- $content .= "<li>$file</li>\n";
- array_push($filelist, $file);
+ list($y, $m, $d) = explode('-', $date);
+ $html = "<h1>Entries for ".date("l, F j, Y", strtotime("$y-$m-$d"))."</h1>";
+ foreach($years[$y][$m][$d] as $entry => $path) {
+ $time = date('g:i:s a', $entry);
+ $html .= "<h2 class='timestamp'>$time</h2>";
+ $html .= Markdown(file_get_contents($path));
}
- closedir($dir);
- $content .= "</ul>\n";
-
- return $content;
- // return Markdown(file_get_contents(CONTENT_DIR.$date_parts[0].'/'.$date_parts[1].'/'.$date_parts[2].EXT));
+ return $html;
}
- } else {
- return "Please choose and entry.";
}
}
-
-
?>
\ No newline at end of file
app/load.php
@@ -34,8 +34,8 @@
<?php foreach($months as $month=>$days) { ?>
<li class="month"><?php echo get_month($month); ?>
<ul>
- <?php foreach($days as $day=>$date) { ?>
- <li class="day"><a href="/?date=<?php echo $date; ?>"><?php echo date("l, \\t\h\e dS", strtotime("$year-$month-$day")); ?></a></li>
+ <?php foreach($days as $day=>$entries) { ?>
+ <li class="day"><a href="/?date=<?php echo "$year-$month-$day"; ?>"><?php echo date("l, \\t\h\e dS", strtotime("$year-$month-$day")); ?></a></li>
<?php } ?>
</ul>
</li>
@@ -46,7 +46,7 @@
</ul>
</div>
<div id="entries">
- <?php echo get_entry(); ?>
+ <?php echo get_entries($_GET['date']); ?>
</div>
</div><!--end #main-->
<div id="footer">
public/index.php
403f9abf878a84eb575eb7affc45e6093a252075
208f693701e11731e263487b343b3f0586131a36
Trey Piepmeier
trey@sitening.com
http://github.com/trey/logbook/commit/05107714c2ac80e65cd302968fd4ba76cfc0e7dd
05107714c2ac80e65cd302968fd4ba76cfc0e7dd
2008-06-29T11:31:24-07:00
2008-06-29T11:31:24-07:00
Merge branch 'postpostmodern/master'
Conflicts:
app/load.php
65e05df3a096098137e8cbeca62bb8e85b880ccf
Trey Piepmeier
trey@sitening.com