+ 
+
\ No newline at end of file
diff --git a/application/_installation/03-create-table-notes.sql b/application/_installation/03-create-table-notes.sql
index 38d0368..c0b01f7 100644
--- a/application/_installation/03-create-table-notes.sql
+++ b/application/_installation/03-create-table-notes.sql
@@ -2,5 +2,10 @@ CREATE TABLE IF NOT EXISTS `huge`.`notes` (
`note_id` int(11) unsigned NOT NULL AUTO_INCREMENT,
`note_text` text NOT NULL,
`user_id` int(11) unsigned NOT NULL,
+ `note_timestamp` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP,
PRIMARY KEY (`note_id`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci COMMENT='user notes';
+
+-- Foreign key constraint
+ALTER TABLE `notes`
+ ADD CONSTRAINT `notes_ibfk_1` FOREIGN KEY (`user_id`) REFERENCES `users` (`user_id`) ON DELETE CASCADE;
diff --git a/application/_installation/04-create-table-messages.sql b/application/_installation/04-create-table-messages.sql
index 74c3129..01802e4 100644
--- a/application/_installation/04-create-table-messages.sql
+++ b/application/_installation/04-create-table-messages.sql
@@ -2,7 +2,7 @@ CREATE TABLE IF NOT EXISTS `messages` (
`id` int(11) NOT NULL AUTO_INCREMENT,
`sender_id` int(11) NOT NULL,
`receiver_id` int(11) DEFAULT NULL,
- `group_type` enum('admins','moderators','all_users') DEFAULT NULL,
+ `group_type` enum('admins','moderators','all_users','global') DEFAULT NULL,
`subject` varchar(255) NOT NULL,
`message` text NOT NULL,
`is_read` tinyint(1) NOT NULL DEFAULT 0,
@@ -11,7 +11,8 @@ CREATE TABLE IF NOT EXISTS `messages` (
PRIMARY KEY (`id`),
KEY `sender_id` (`sender_id`),
KEY `receiver_id` (`receiver_id`),
- KEY `is_read` (`is_read`)
+ KEY `is_read` (`is_read`),
+ KEY `group_type` (`group_type`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
-- Foreign key constraints
diff --git a/application/config/config.development.php b/application/config/config.development.php
index fd599b1..4fb05ea 100644
--- a/application/config/config.development.php
+++ b/application/config/config.development.php
@@ -63,7 +63,7 @@ return array(
* DB_CHARSET The charset, necessary for security reasons. Check Database.php class for more info.
*/
'DB_TYPE' => 'mysql',
- 'DB_HOST' => '127.0.0.1',
+ 'DB_HOST' => 'localhost',
'DB_NAME' => 'huge',
'DB_USER' => 'root',
'DB_PASS' => 'root',
diff --git a/application/controller/MessageController.php b/application/controller/MessageController.php
index 4762a42..b51b586 100644
--- a/application/controller/MessageController.php
+++ b/application/controller/MessageController.php
@@ -10,6 +10,15 @@ class MessageController extends Controller
Auth::checkAuthentication();
}
+ /**
+ * Check if the request is an AJAX request
+ */
+ private function isAjaxRequest()
+ {
+ return isset($_SERVER['HTTP_X_REQUESTED_WITH']) &&
+ strtolower($_SERVER['HTTP_X_REQUESTED_WITH']) === 'xmlhttprequest';
+ }
+
/**
* Send a message to a specific user via URL parameters
* URL format: message/send/{receiver_id}/{subject}/{message}
@@ -23,6 +32,13 @@ class MessageController extends Controller
$message = isset($_POST['message']) ? $_POST['message'] : null;
if (!$receiver_id || !$message) {
+ // Return JSON for AJAX requests
+ if ($this->isAjaxRequest()) {
+ header('Content-Type: application/json');
+ echo json_encode(['success' => false, 'message' => 'Receiver and message are required']);
+ return;
+ }
+
Session::add('feedback_negative', 'Receiver and message are required');
Redirect::to('message');
return;
@@ -32,6 +48,18 @@ class MessageController extends Controller
$sender_id = Session::get('user_id');
$success = MessageModel::sendToUser($sender_id, $receiver_id, $subject, $message);
+ // Return JSON for AJAX requests
+ if ($this->isAjaxRequest()) {
+ header('Content-Type: application/json');
+ if ($success) {
+ echo json_encode(['success' => true, 'message' => 'Message sent successfully']);
+ } else {
+ echo json_encode(['success' => false, 'message' => 'Failed to send message']);
+ }
+ return;
+ }
+
+ // Regular request handling
if ($success) {
Session::add('feedback_positive', 'Message sent successfully');
} else {
@@ -150,6 +178,64 @@ class MessageController extends Controller
}
}
+ /**
+ * Handle reply to a message
+ */
+ public function reply()
+ {
+ // Always return JSON for this endpoint
+ header('Content-Type: application/json');
+
+ // Start output buffering to catch any accidental output
+ ob_start();
+
+ try {
+ if ($_SERVER['REQUEST_METHOD'] !== 'POST') {
+ echo json_encode(['success' => false, 'message' => 'Invalid request method']);
+ exit();
+ }
+
+ $receiver_id = isset($_POST['receiver_id']) ? $_POST['receiver_id'] : null;
+ $message = isset($_POST['message']) ? $_POST['message'] : null;
+
+ if (!$receiver_id || !$message) {
+ echo json_encode(['success' => false, 'message' => 'Receiver and message are required']);
+ exit();
+ }
+
+ $sender_id = Session::get('user_id');
+ if (!$sender_id) {
+ echo json_encode(['success' => false, 'message' => 'Not logged in']);
+ exit();
+ }
+
+ // Send the message (using sendToUser without subject)
+ $success = MessageModel::sendToUser($sender_id, $receiver_id, 'Re: Message', $message);
+
+ if ($success) {
+ echo json_encode(['success' => true, 'message' => 'Reply sent successfully']);
+ } else {
+ echo json_encode(['success' => false, 'message' => 'Failed to send reply']);
+ }
+ } catch (Exception $e) {
+ // Catch any PHP errors
+ echo json_encode(['success' => false, 'message' => 'Server error: ' . $e->getMessage()]);
+ }
+
+ // Clean any output buffer and exit
+ ob_end_clean();
+ exit();
+ }
+
+ /**
+ * Show global chat interface
+ */
+ public function global()
+ {
+ // Redirect to main messages page with global chat hash
+ Redirect::to('message#load-global');
+ }
+
/**
* Show the messenger interface
*/
@@ -189,13 +275,95 @@ class MessageController extends Controller
return;
}
+ // Redirect to main messages page with conversation hash
+ Redirect::to('message#load-conversation-' . $other_user_id);
+ }
+
+ /**
+ * Get conversation messages as JSON (AJAX endpoint)
+ */
+ public function getConversationMessages()
+ {
+ $user_id = Session::get('user_id');
+ $url_parts = explode('/', trim($_SERVER['REQUEST_URI'], '/'));
+ $other_user_id = isset($url_parts[2]) ? $url_parts[2] : null;
+
+ if (!$other_user_id) {
+ header('Content-Type: application/json');
+ echo json_encode(['success' => false, 'message' => 'Missing user ID']);
+ return;
+ }
+
// Get messages
$messages = MessageModel::getMessagesWithUser($user_id, $other_user_id);
- $this->View->render('message/conversation', array(
- 'messages' => $messages,
- 'other_user' => $other_user
- ));
+ // Mark messages as read when loading the conversation
+ MessageModel::markAsRead($user_id, $other_user_id);
+
+ header('Content-Type: application/json');
+ echo json_encode(['success' => true, 'messages' => $messages]);
+ }
+
+ /**
+ * Get global chat messages as JSON (AJAX endpoint)
+ */
+ public function getGlobalMessages()
+ {
+ // Always return JSON for this endpoint
+ header('Content-Type: application/json');
+
+ $messages = MessageModel::getGlobalMessages();
+ echo json_encode(['success' => true, 'messages' => $messages]);
+
+ // Stop any further execution
+ exit();
+ }
+
+ /**
+ * Send message to global chat
+ */
+ public function sendToGlobal()
+ {
+ // Always return JSON for this endpoint
+ header('Content-Type: application/json');
+
+ // Start output buffering to catch any accidental output
+ ob_start();
+
+ try {
+ if ($_SERVER['REQUEST_METHOD'] !== 'POST') {
+ echo json_encode(['success' => false, 'message' => 'Invalid request method']);
+ exit();
+ }
+
+ $message = isset($_POST['message']) ? $_POST['message'] : null;
+ $sender_id = Session::get('user_id');
+
+ if (!$message) {
+ echo json_encode(['success' => false, 'message' => 'Message is required']);
+ exit();
+ }
+
+ if (!$sender_id) {
+ echo json_encode(['success' => false, 'message' => 'Not logged in']);
+ exit();
+ }
+
+ $success = MessageModel::sendToGlobal($sender_id, $message);
+
+ if ($success) {
+ echo json_encode(['success' => true, 'message' => 'Message sent to global chat']);
+ } else {
+ echo json_encode(['success' => false, 'message' => 'Failed to send message']);
+ }
+ } catch (Exception $e) {
+ // Catch any PHP errors
+ echo json_encode(['success' => false, 'message' => 'Server error: ' . $e->getMessage()]);
+ }
+
+ // Clean any output buffer and exit
+ ob_end_clean();
+ exit();
}
/**
diff --git a/application/controller/NoteController.php b/application/controller/NoteController.php
index f44ee7e..46f381d 100644
--- a/application/controller/NoteController.php
+++ b/application/controller/NoteController.php
@@ -3,6 +3,8 @@
/**
* The note controller: Just an example of simple create, read, update and delete (CRUD) actions.
*/
+require_once __DIR__ . '/../libs/SimpleMarkdown.php';
+
class NoteController extends Controller
{
/**
@@ -29,6 +31,23 @@ class NoteController extends Controller
));
}
+ /**
+ * Get note as JSON (AJAX endpoint)
+ */
+ public function getNote($note_id)
+ {
+ $note = NoteModel::getNote($note_id);
+
+ header('Content-Type: application/json');
+ if ($note) {
+ // Add markdown version
+ $note->note_html = SimpleMarkdown::parse($note->note_text);
+ echo json_encode(['success' => true, 'note' => $note]);
+ } else {
+ echo json_encode(['success' => false, 'message' => 'Note not found']);
+ }
+ }
+
/**
* This method controls what happens when you move to /dashboard/create in your app.
* Creates a new note. This is usually the target of form submit actions.
@@ -36,7 +55,18 @@ class NoteController extends Controller
*/
public function create()
{
- NoteModel::createNote(Request::post('note_text'));
+ $success = NoteModel::createNote(Request::post('note_text'));
+
+ if ($this->isAjaxRequest()) {
+ header('Content-Type: application/json');
+ if ($success) {
+ echo json_encode(['success' => true, 'message' => 'Note created successfully']);
+ } else {
+ echo json_encode(['success' => false, 'message' => 'Failed to create note']);
+ }
+ return;
+ }
+
Redirect::to('note');
}
@@ -59,7 +89,18 @@ class NoteController extends Controller
*/
public function editSave()
{
- NoteModel::updateNote(Request::post('note_id'), Request::post('note_text'));
+ $success = NoteModel::updateNote(Request::post('note_id'), Request::post('note_text'));
+
+ if ($this->isAjaxRequest()) {
+ header('Content-Type: application/json');
+ if ($success) {
+ echo json_encode(['success' => true, 'message' => 'Note updated successfully']);
+ } else {
+ echo json_encode(['success' => false, 'message' => 'Failed to update note']);
+ }
+ return;
+ }
+
Redirect::to('note');
}
@@ -71,7 +112,27 @@ class NoteController extends Controller
*/
public function delete($note_id)
{
- NoteModel::deleteNote($note_id);
+ $success = NoteModel::deleteNote($note_id);
+
+ if ($this->isAjaxRequest()) {
+ header('Content-Type: application/json');
+ if ($success) {
+ echo json_encode(['success' => true, 'message' => 'Note deleted successfully']);
+ } else {
+ echo json_encode(['success' => false, 'message' => 'Failed to delete note']);
+ }
+ return;
+ }
+
Redirect::to('note');
}
+
+ /**
+ * Check if the request is an AJAX request
+ */
+ private function isAjaxRequest()
+ {
+ return isset($_SERVER['HTTP_X_REQUESTED_WITH']) &&
+ strtolower($_SERVER['HTTP_X_REQUESTED_WITH']) === 'xmlhttprequest';
+ }
}
diff --git a/application/core/View.php b/application/core/View.php
index 035fdf3..962466b 100644
--- a/application/core/View.php
+++ b/application/core/View.php
@@ -17,6 +17,15 @@ class View
public $avatar_file_path;
public $user_account_type;
+ /* Messenger properties */
+ public $conversations;
+ public $unread_count;
+ public $all_users;
+
+ /* Note properties */
+ public $messages;
+ public $other_user;
+
/**
* Static property to track if header has been rendered
*/
diff --git a/application/libs/SimpleMarkdown.php b/application/libs/SimpleMarkdown.php
new file mode 100644
index 0000000..28d5d79
--- /dev/null
+++ b/application/libs/SimpleMarkdown.php
@@ -0,0 +1,102 @@
+ quotes
+ */
+
+class SimpleMarkdown
+{
+ /**
+ * Parse markdown text to HTML
+ */
+ public static function parse($text)
+ {
+ // Convert special characters to HTML entities first
+ $text = htmlspecialchars($text, ENT_QUOTES, 'UTF-8');
+
+ // Headers (h1-h6)
+ $text = preg_replace('/^#{1,6}\s+(.+)$/m', '
+$1
', $text); + + // Bold text + $text = preg_replace('/\*\*(.+?)\*\*/', '$1', $text); + + // Italic text + $text = preg_replace('/\*(.+?)\*/', '$1', $text); + + // Inline code + $text = preg_replace('/`(.+?)`/', '$1', $text);
+
+ // Code blocks
+ $text = preg_replace('/```(.+?)```/s', '$1$1', $text); + + // Unordered lists + $text = preg_replace('/^\-\s+(.+)$/m', '
- $1
', $text); + + return $text; + } + + /** + * Convert HTML back to markdown (simplified) + * This is a basic implementation - may not handle all cases perfectly + */ + public static function toMarkdown($html) + { + // Basic HTML to markdown conversion + $markdown = $html; + + // Headers + $markdown = preg_replace('/
(.+?)<\/code>/i', '`$1`', $markdown);
+ $markdown = preg_replace('/(.+?)<\/code><\/pre>/is', "```$1```", $markdown);
+
+ // Links
+ $markdown = preg_replace('/(.+?)<\/a>/i', '[$2]($1)', $markdown);
+
+ // Blockquotes
+ $markdown = preg_replace('/(.+?)<\/blockquote>/i', '> $1', $markdown);
+
+ // Lists (simplified)
+ $markdown = preg_replace('/(.+?)<\/ul>/is', '$1', $markdown);
+ $markdown = preg_replace('/- (.+?)<\/li>/i', '- $1', $markdown);
+
+ // Line breaks
+ $markdown = preg_replace('/
/i', "\n", $markdown);
+
+ // Decode HTML entities
+ $markdown = htmlspecialchars_decode($markdown, ENT_QUOTES);
+
+ // Clean up
+ $markdown = preg_replace('/\n{3,}/', "\n\n", $markdown);
+ $markdown = trim($markdown);
+
+ return $markdown;
+ }
+}
+?>
\ No newline at end of file
diff --git a/application/model/MessageModel.php b/application/model/MessageModel.php
index 6ecef85..3492ce4 100644
--- a/application/model/MessageModel.php
+++ b/application/model/MessageModel.php
@@ -6,8 +6,8 @@ class MessageModel
{
$database = DatabaseFactory::getFactory()->getConnection();
- $sql = "INSERT INTO messages (sender_id, receiver_id, group_type, subject, message)
- VALUES (:sender_id, :receiver_id, :group_type, :subject, :message)";
+ $sql = "INSERT INTO messages (sender_id, receiver_id, group_type, subject, message, is_read)
+ VALUES (:sender_id, :receiver_id, :group_type, :subject, :message, 0)";
$query = $database->prepare($sql);
return $query->execute(array(
':sender_id' => $sender_id,
@@ -170,6 +170,36 @@ class MessageModel
return $query->fetchAll();
}
+ public static function getGlobalMessages()
+ {
+ $database = DatabaseFactory::getFactory()->getConnection();
+
+ $sql = "SELECT m.*, u.user_name as sender_name,
+ 'received' as message_type
+ FROM messages m
+ JOIN users u ON m.sender_id = u.user_id
+ WHERE m.group_type = 'global'
+ AND m.receiver_id IS NULL
+ ORDER BY m.created_at ASC";
+
+ $query = $database->prepare($sql);
+ $query->execute();
+ return $query->fetchAll();
+ }
+
+ public static function sendToGlobal($sender_id, $message)
+ {
+ $database = DatabaseFactory::getFactory()->getConnection();
+
+ $sql = "INSERT INTO messages (sender_id, group_type, subject, message, is_read)
+ VALUES (:sender_id, 'global', 'Global Chat', :message, 1)";
+ $query = $database->prepare($sql);
+ return $query->execute(array(
+ ':sender_id' => $sender_id,
+ ':message' => $message
+ ));
+ }
+
public static function getAllUsers($current_user_id)
{
$database = DatabaseFactory::getFactory()->getConnection();
diff --git a/application/model/NoteModel.php b/application/model/NoteModel.php
index d67ba9f..704e96e 100644
--- a/application/model/NoteModel.php
+++ b/application/model/NoteModel.php
@@ -14,12 +14,20 @@ class NoteModel
{
$database = DatabaseFactory::getFactory()->getConnection();
- $sql = "SELECT user_id, note_id, note_text FROM notes WHERE user_id = :user_id";
+ $sql = "SELECT note_id, note_text, note_timestamp FROM notes WHERE user_id = :user_id ORDER BY note_timestamp DESC";
$query = $database->prepare($sql);
$query->execute(array(':user_id' => Session::get('user_id')));
// fetchAll() is the PDO method that gets all result rows
- return $query->fetchAll();
+ $notes = $query->fetchAll();
+
+ // Add markdown HTML to each note
+ require_once __DIR__ . '/../libs/SimpleMarkdown.php';
+ foreach ($notes as &$note) {
+ $note->note_html = SimpleMarkdown::parse($note->note_text);
+ }
+
+ return $notes;
}
/**
@@ -29,13 +37,21 @@ class NoteModel
*/
public static function getNote($note_id)
{
- $database = DatabaseFactory::getFactory()->getConnectionWithMySQLI();
+ $database = DatabaseFactory::getFactory()->getConnection();
- $sql = "SELECT user_id, note_id, note_text FROM notes WHERE user_id = :user_id AND note_id = :note_id LIMIT 1";
+ $sql = "SELECT note_id, note_text, note_timestamp FROM notes WHERE user_id = :user_id AND note_id = :note_id LIMIT 1";
$query = $database->prepare($sql);
$query->execute(array(':user_id' => Session::get('user_id'), ':note_id' => $note_id));
- return $query;
+ $result = $query->fetch();
+
+ // Add markdown HTML
+ if ($result) {
+ require_once __DIR__ . '/../libs/SimpleMarkdown.php';
+ $result->note_html = SimpleMarkdown::parse($result->note_text);
+ }
+
+ return $result ? $result : null;
}
/**
diff --git a/application/view/message/conversation.php b/application/view/message/conversation.php
index 7062df0..ebb1991 100644
--- a/application/view/message/conversation.php
+++ b/application/view/message/conversation.php
@@ -1,115 +1,17 @@
-
-
-
-
-
- Back to Messenger
-
-
-
-
+render('_templates/header'); ?>
-
-
-
-
-
- Conversation with other_user->user_name) ?>
-
-
-
-
-
-
+
+ renderFeedbackMessages(); ?>
+
+
+
+
+ Redirecting to Conversation...
+ If you're not redirected automatically, click here.
-
-
-
-
-
-render('_templates/footer'); ?>
+render('_templates/footer'); ?>
\ No newline at end of file
diff --git a/application/view/message/global.php b/application/view/message/global.php
new file mode 100644
index 0000000..d867812
--- /dev/null
+++ b/application/view/message/global.php
@@ -0,0 +1,17 @@
+render('_templates/header'); ?>
+
+
+ renderFeedbackMessages(); ?>
+
+
+
+
+ Redirecting to Global Chat...
+ If you're not redirected automatically, click here.
+
+
+
+render('_templates/footer'); ?>
\ No newline at end of file
diff --git a/application/view/message/index.php b/application/view/message/index.php
index 54779f2..7a072f5 100644
--- a/application/view/message/index.php
+++ b/application/view/message/index.php
@@ -1,175 +1,701 @@
-
- Messenger
+
+ Messenger
+ renderFeedbackMessages(); ?>
-
-
-
-
-
- Conversations
- unread_count > 0): ?>
- unread_count ?>
-
-
-
-
- conversations)): ?>
-
- No conversations yet
-
-
- conversations as $conv): ?>
-
-
- user_name) ?>
- unread_count > 0): ?>
- unread_count ?>
-
-
-
- last_message_time)) ?>
-
-
-
-
-
-
-
+
+
+
+
-
-
- New Message
-
-