the-tempus-project/thetempusproject
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

update to bootstrap 4 p1, bugfix for logoLarge, logging cleanup, more

Browse Source
This commit is contained in:
Joey Kimsey
2024-12-08 04:35:25 -05:00
parent 9abd3865f5
commit dcbe7c2ac0
25 changed files with 509 additions and 264 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
app/plugins/messages/models/message.php
View File

@ -61,7 +61,7 @@ class Message extends DatabaseModel {
Debug::info( 'Invalid user ID' );
return false;
}
$messageData = self::$db->getPaginated( $this->tableName, [ 'ID', '=', $parent ] );
$messageData = self::$db->get( $this->tableName, [ 'ID', '=', $parent ] );
if ( $messageData->count() == 0 ) {
Debug::info( 'Message not found.' );
return false;
@ -71,7 +71,7 @@ class Message extends DatabaseModel {
if ( $type !== null ) {
$params = array_merge( $params, [ 'AND', $type, '=', $user ] );
}
$messageData = self::$db->getPaginated( $this->tableName, $params, 'ID', 'DESC', [ 0, 1 ] );
$messageData = self::$db->get( $this->tableName, $params, 'ID', 'DESC', [ 0, 1 ] );
if ( $messageData->count() != 0 ) {
if ( $messageData->first()->recieverDeleted == 0 ) {
$message = $messageData->first();
@ -93,7 +93,7 @@ class Message extends DatabaseModel {
Debug::info( 'Invalid ID' );
return false;
}
$messageData = self::$db->getPaginated( $this->tableName, [ 'ID', '=', $id ] );
$messageData = self::$db->get( $this->tableName, [ 'ID', '=', $id ] );
if ( $messageData->count() == 0 ) {
Debug::info( 'Message not found.' );
return false;
@ -122,7 +122,7 @@ class Message extends DatabaseModel {
} else {
$find = $message->ID;
}
$messageData = self::$db->getPaginated( $this->tableName, [ 'ID', '=', $find, 'OR', 'Parent', '=', $find ], 'ID', 'ASC' )->results();
$messageData = self::$db->get( $this->tableName, [ 'ID', '=', $find, 'OR', 'Parent', '=', $find ], 'ID', 'ASC' )->results();
Components::set( 'PID', $find );
if ( $markRead == true ) {
@ -138,7 +138,7 @@ class Message extends DatabaseModel {
$limit = 10;
}
$limit = [ 0, $limit ];
$messageData = self::$db->getPaginated(
$messageData = self::$db->get(
$this->tableName,
[
'parent', '=', 0,
@ -154,7 +154,7 @@ class Message extends DatabaseModel {
$limit
);
if ( $messageData->count() == 0 ) {
Debug::info( 'No messages found' );
Debug::info( 'getInbox: No messages found' );
return false;
}
$filters = [
@ -175,7 +175,7 @@ class Message extends DatabaseModel {
$limit = 10;
}
$limit = [ 0, $limit ];
$messageData = self::$db->getPaginated(
$messageData = self::$db->get(
$this->tableName,
[
'parent', '=', 0,
@ -187,7 +187,7 @@ class Message extends DatabaseModel {
$limit
);
if ( $messageData->count() == 0 ) {
Debug::info( 'No messages found' );
Debug::info( 'getOutbox: No messages found' );
return false;
}
$filters = [

30
app/plugins/messages/plugin.php
View File

@ -32,23 +32,23 @@ class Messages extends Plugin {
],
];
private static $loaded = false;
public function __construct() {
// This was taken directly from the main app
// load the message template data as part of the template
$messages = new Message;
Components::set( 'MESSAGE_COUNT', $messages->unreadCount() );
if ( $messages->unreadCount() > 0 ) {
$messageBadge = Views::simpleView( 'messages.badge' );
} else {
$messageBadge = '';
}
Components::set( 'MBADGE', $messageBadge );
if ( App::$isLoggedIn ) {
Components::set( 'RECENT_MESSAGES', Views::simpleView( 'messages.nav.recentMessagesDropdown', $messages->getInbox( 5 ) ) );
} else {
Components::set( 'RECENT_MESSAGES', '' );
}
if ( ! self::$loaded ) {
$messages = new Message;
Components::set( 'MESSAGE_COUNT', $messages->unreadCount() );
if ( $messages->unreadCount() > 0 ) {
$messageBadge = Views::simpleView( 'messages.badge' );
} else {
$messageBadge = '';
}
Components::set( 'MBADGE', $messageBadge );
if ( App::$isLoggedIn ) {
Components::set( 'RECENT_MESSAGES', Views::simpleView( 'messages.nav.recentMessagesDropdown', $messages->getInbox( 5 ) ) );
} else {
Components::set( 'RECENT_MESSAGES', '' );
}
App::$topNavRight .= '{RECENT_MESSAGES}';
App::$topNavRightDropdown .= '<li><a href="{ROOT_URL}messages"><i class="fa fa-fw fa-envelope"></i> Inbox {MBADGE}</a></li>';
self::$loaded = true;