diff --git a/config.php b/config.php index 2d75ee9..c489355 100644 --- a/config.php +++ b/config.php @@ -72,6 +72,15 @@ if (!isset($notemplate)) { $res = $sql->query("SELECT `value` FROM `config` WHERE `key` = \"username\";")->fetch_assoc(); $user_name = htmlspecialchars($res['value']); + // show recent? + $res = $sql->query("SELECT `value` FROM `config` WHERE `key` = \"recent_public\";")->fetch_assoc(); + $recent_public = $res['value'] === "true" ? true : false; + $recent_count = 0; + if ($recent_public) { + $res = $sql->query("SELECT `value` FROM `config` WHERE `key` = \"recent_count\";")->fetch_assoc(); + $recent_count = (int) $res['value']; + } + // the flash $message = null; if (isset($_SESSION['flash'])) { @@ -84,5 +93,7 @@ if (!isset($notemplate)) { $tpl->assign("user_name", $user_name); $tpl->assign("words_total", $words_total_count); $tpl->assign("inbox_count", $new_words_count); + $tpl->assign("recent_public", $recent_public); + $tpl->assign("recent_count", $recent_count); $tpl->assign("message", $message); } \ No newline at end of file diff --git a/index.php b/index.php index 8083457..5366fa7 100644 --- a/index.php +++ b/index.php @@ -64,4 +64,22 @@ if (isset($_POST['words'])) { exit(); } +$words = array(); + +if ($recent_public) { + $sql_str = "SELECT `word1`, `word2`, `word3`, `author`, `new` FROM `words` ORDER BY `id` DESC LIMIT " . $recent_count . ";"; + $res = $sql->query($sql_str); + + while ($r = $res->fetch_assoc()) { + array_push($words, array( + "word1" => $r['word1'], + "word2" => $r['word2'], + "word3" => $r['word3'], + "author" => $r['author'], + "new" => ($r['new'] == 1 ? true : false) + )); + } +} + +$tpl->assign("words", $words); $tpl->draw("index"); \ No newline at end of file diff --git a/install.php b/install.php index 042c036..e091dfa 100644 --- a/install.php +++ b/install.php @@ -41,7 +41,7 @@ CREATE TABLE IF NOT EXISTS `words` ( `word3` VARCHAR(45) NULL, `author` VARCHAR(45) NULL, `new` BOOLEAN, - `created_at` TIMESTAMP NULL, + `created_at` TIMESTAMP NULL DEFAULT CURRENT_TIMESTAMP, PRIMARY KEY (`id`) ) ENGINE=InnoDB DEFAULT CHARSET=utf8 AUTO_INCREMENT=1 ; diff --git a/views/index.html~ b/views/index.html~ new file mode 100644 index 0000000..6dc41c1 --- /dev/null +++ b/views/index.html~ @@ -0,0 +1,59 @@ +{include="layout"} +{include="navbar"} +
+{if="$message"} +
{$message}
+{/if} +

{$site_name}!

+
+

Want to tell them who you are?

+
+
+ +
+
+ +
+
+ +
+
+
+
+ +
+
+ +
+<<<<<<< HEAD +{if="$recent_answers"} +
+
+

Recent Answers by others:

+ + + {loop="$recent"} + + + + {/loop} + +
{$value.author} wrote that {$user_name} is {$value.word1}, {$value.word2} and {$value.word3}
+
+
+======= +{if="$recent_public"} +

Recent Answers by others:

+ + + {loop="$words"} + + + + {/loop} + +
{$value.author} wrote that {$user_name} is {$value.word1}, {$value.word2} and {$value.word3}
+>>>>>>> 95c4db170369fc5edd52d9277936175e39c5816c +{/if} +
+{include="footer"} \ No newline at end of file