From 59460fb22af914c16def172242c2d86e27105001 Mon Sep 17 00:00:00 2001
From: flashwave <me@flash.moe>
Date: Mon, 19 Oct 2015 23:25:20 +0200
Subject: [PATCH] r20151019

Signed-off-by: Flashwave <me@flash.moe>
---
 _sakura/components/Database.php              |  8 ++++++++
 _sakura/components/Forum.php                 | 10 +++++++---
 _sakura/components/database/mysql.php        |  8 ++++++++
 _sakura/sakura.php                           |  6 +-----
 _sakura/templates/yuuno/forum/forumEntry.tpl |  3 ++-
 _sakura/templates/yuuno/forum/posting.tpl    |  6 +++---
 _sakura/templates/yuuno/forum/topicEntry.tpl |  2 +-
 public/content/data/yuuno/js/yuuno.js        |  2 +-
 8 files changed, 31 insertions(+), 14 deletions(-)

diff --git a/_sakura/components/Database.php b/_sakura/components/Database.php
index a514921..809768e 100755
--- a/_sakura/components/Database.php
+++ b/_sakura/components/Database.php
@@ -78,4 +78,12 @@ class Database
         return self::$database->count($table, $data, $prefix);
 
     }
+
+    // Get the ID of the last inserted item
+    public static function lastInsertID($name = null)
+    {
+
+        return self::$database->lastInsertID($name);
+
+    }
 }
diff --git a/_sakura/components/Forum.php b/_sakura/components/Forum.php
index c443817..e5a0742 100755
--- a/_sakura/components/Forum.php
+++ b/_sakura/components/Forum.php
@@ -387,7 +387,9 @@ class Forum
             ]);
 
             // Fetch the last insert
-            $getThread = Database::fetch('topics', false, null, ['topic_id', true]);
+            $getThread = Database::fetch('topics', false, [
+                'topic_id' => [Database::lastInsertID(), '='],
+            ]);
         }
 
         // Insert the post
@@ -404,12 +406,14 @@ class Forum
         ]);
 
         // Fetch the last insert
-        $getPost = Database::fetch('posts', false, null, ['post_id', true]);
+        $getPost = Database::fetch('posts', false, [
+            'post_id' => [Database::lastInsertID(), '='],
+        ]);
 
         // Update the topic with the last details
         Database::update('topics', [
             [
-                'topic_last_reply' => time(),
+                'topic_last_reply' => $getPost['post_id'],
             ],
             [
                 'topic_id' => [$getPost['topic_id'], '='],
diff --git a/_sakura/components/database/mysql.php b/_sakura/components/database/mysql.php
index e2ebe4b..542db69 100755
--- a/_sakura/components/database/mysql.php
+++ b/_sakura/components/database/mysql.php
@@ -388,4 +388,12 @@ class MySQL
         return $query->fetch(PDO::FETCH_BOTH);
 
     }
+
+    // Get the ID of the last inserted item
+    public function lastInsertID($name = null)
+    {
+
+        return $this->sql->lastInsertID($name);;
+
+    }
 }
diff --git a/_sakura/sakura.php b/_sakura/sakura.php
index 557b4b3..bd6734d 100755
--- a/_sakura/sakura.php
+++ b/_sakura/sakura.php
@@ -8,7 +8,7 @@
 namespace Sakura;
 
 // Define Sakura version
-define('SAKURA_VERSION', '20151018');
+define('SAKURA_VERSION', '20151019');
 define('SAKURA_VLABEL', 'Eminence');
 define('SAKURA_COLOUR', '#6C3082');
 define('SAKURA_STABLE', false);
@@ -76,14 +76,10 @@ if (Configuration::getConfig('no_cron_service')) {
         // Update last execution time
         Database::update('config', [
             [
-
                 'config_value' => time(),
-
             ],
             [
-
                 'config_name' => ['no_cron_last', '='],
-
             ],
         ]);
 
diff --git a/_sakura/templates/yuuno/forum/forumEntry.tpl b/_sakura/templates/yuuno/forum/forumEntry.tpl
index 8d77d0d..45414fd 100755
--- a/_sakura/templates/yuuno/forum/forumEntry.tpl
+++ b/_sakura/templates/yuuno/forum/forumEntry.tpl
@@ -29,7 +29,8 @@
             <td class="forumLastColumn">
                 <div>
                     {% if forum.last_post.post_id %}
-                        <a href="{{ urls.format('FORUM_THREAD', [forum.last_post.topic_id]) }}" class="default">{{ forum.last_post.post_subject }}</a><br /><span title="{{ forum.last_post.post_time|date(sakura.dateFormat) }}">{{ forum.last_post.elapsed }}</span> by {% if forum.last_poster.data.user_id %}<a href="{{ urls.format('USER_PROFILE', [forum.last_poster.data.user_id]) }}" class="default" style="color: {{ forum.last_poster.colour }}; text-shadow: 0 0 5px {% if forum.last_poster.colour != 'inherit' %}{{ forum.last_poster.colour }}{% else %}#222{% endif %};">{{ forum.last_poster.data.username }}</a>{% else %}[deleted user]{% endif %} <a href="{{ urls.format('FORUM_POST', [forum.last_post.post.post_id]) }}#p{{ forum.last_poster.post.post_id }}" class="default fa fa-tag"></a>
+                        <a href="{{ urls.format('FORUM_THREAD', [forum.last_post.topic_id]) }}" class="default">{{ forum.last_post.post_subject }}</a><br />
+                        <span title="{{ forum.last_post.post_time|date(sakura.dateFormat) }}">{{ forum.last_post.elapsed }}</span> by {% if forum.last_poster.data.user_id %}<a href="{{ urls.format('USER_PROFILE', [forum.last_poster.data.user_id]) }}" class="default" style="color: {{ forum.last_poster.colour }}; text-shadow: 0 0 5px {% if forum.last_poster.colour != 'inherit' %}{{ forum.last_poster.colour }}{% else %}#222{% endif %};">{{ forum.last_poster.data.username }}</a>{% else %}[deleted user]{% endif %} <a href="{{ urls.format('FORUM_POST', [forum.last_post.post_id]) }}#p{{ forum.last_post.post_id }}" class="default fa fa-tag"></a>
                     {% else %}
                         There are no posts in this forum.<br />&nbsp;
                     {% endif %}
diff --git a/_sakura/templates/yuuno/forum/posting.tpl b/_sakura/templates/yuuno/forum/posting.tpl
index f6e9aa5..68678d4 100755
--- a/_sakura/templates/yuuno/forum/posting.tpl
+++ b/_sakura/templates/yuuno/forum/posting.tpl
@@ -8,7 +8,7 @@
         <form id="forumPostingForm" method="post" action="{{ sakura.currentPage }}">
             <div class="head">Forum / Posting</div>
             <div class="posting-subject">
-                <input type="text" class="inputStyling" name="subject" placeholder="Subject" />
+                <input type="text" class="inputStyling" name="subject" placeholder="Subject" value="{{ posting.subject }}" />
             </div>
             <hr class="default" />
             <div class="posting-bbcodes">
@@ -24,7 +24,7 @@
             </div>
             <hr class="default" />
             <div class="posting-text">
-                <textarea class="inputStyling" name="text" id="postingText"></textarea>
+                <textarea class="inputStyling" name="text" id="postingText">{{ posting.text }}</textarea>
             </div>
             <hr class="default" />
             <div class="posting-emotes">
@@ -36,7 +36,7 @@
             <div class="posting-options">
                 <div>
                     <div>
-                        <input type="checkbox" id="enableSig" checked="checked" /> <label for="enableSig">Attach Signature</label>
+                        <input type="checkbox" id="enableSig" {% if posting.enabledSig %}checked="checked"{% endif %}/> <label for="enableSig">Attach Signature</label>
                     </div>
                     <div>
                         <input type="checkbox" id="enableEmotes" checked="checked" /> <label for="enableEmotes">Parse emoticons</label>
diff --git a/_sakura/templates/yuuno/forum/topicEntry.tpl b/_sakura/templates/yuuno/forum/topicEntry.tpl
index f297439..d26c58f 100755
--- a/_sakura/templates/yuuno/forum/topicEntry.tpl
+++ b/_sakura/templates/yuuno/forum/topicEntry.tpl
@@ -21,7 +21,7 @@
             <a href="{{ urls.format('USER_PROFILE', [topic.last_poster.data.user_id]) }}" class="default" style="color: {{ topic.last_poster.colour }}; text-shadow: 0 0 5px {% if topic.last_poster.colour != 'inherit' %}{{ topic.last_poster.colour }}{% else %}#222{% endif %};">{{ topic.last_poster.data.username }}</a>
         {% else %}
             [deleted user]
-        {% endif %} <a href="{{ urls.format('FORUM_POST', [topic.last_post.post.post_id]) }}#p{{ topic.last_post.post.post_id }}" class="default fa fa-tag"></a><br />
+        {% endif %} <a href="{{ urls.format('FORUM_POST', [topic.last_post.post_id]) }}#p{{ topic.last_post.post_id }}" class="default fa fa-tag"></a><br />
         <span title="{{ topic.last_post.post.post_time|date(sakura.dateFormat) }}">{{ topic.last_post.elapsed }}</span>
     </td>
 </tr>
diff --git a/public/content/data/yuuno/js/yuuno.js b/public/content/data/yuuno/js/yuuno.js
index a36e40b..4279931 100755
--- a/public/content/data/yuuno/js/yuuno.js
+++ b/public/content/data/yuuno/js/yuuno.js
@@ -218,7 +218,7 @@ function notifyRequest(session) {
 
                 }
 
-            } else {
+            } else if((notificationWatcher.status + '').substring(0, 1) == '5') {
 
                 // ELse tell the user there was an internal server error...
                 notifyUI({