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

bugfixes for pagination and installation

Browse Source
This commit is contained in:
Joey Kimsey
2024-08-21 06:14:54 -04:00
parent 551f6654f6
commit 5c7a320c2a
23 changed files with 50 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/classes/installer.php
View File

@ -439,7 +439,7 @@ class Installer {
// exclude any flags we don't have a matric map for
if ( empty( $module_data->class_object->$matrix ) ) {
Debug::warn( "$flag_type does not have a proper matrix map and cannot be uninstalled." );
Debug::warn( "$flag_type does not have a proper matrix map and cannot be installed." );
$module_data->$flag_type = INSTALL_STATUS_NOT_FOUND;
}
}
@ -500,7 +500,7 @@ class Installer {
// exclude any flags we don't have a matric map for
if ( empty( $module_data->class_object->$matrix ) ) {
Debug::warn( "$flag_type does not have a proper matrix map and cannot be installed." );
Debug::warn( "$flag_type does not have a proper matrix map and cannot be uninstalled." );
$module_data->$flag_type = INSTALL_STATUS_NOT_FOUND;
}
}

2
app/controllers/admin/admin.php
View File

@ -39,7 +39,7 @@ class Admin extends AdminController {
}
public function index() {
return Views::view( 'admin.logs.admin_list', self::$log->list( 'admin' ) );
return Views::view( 'admin.logs.admin_list', self::$log->listPaginated( 'admin' ) );
}
public function view( $id = null ) {

2
app/controllers/admin/errors.php
View File

@ -39,7 +39,7 @@ class Errors extends AdminController {
}
public function index() {
return Views::view( 'admin.logs.error_list', self::$log->list( 'error' ) );
return Views::view( 'admin.logs.error_list', self::$log->listPaginated( 'error' ) );
}
public function view( $id = null ) {

2
app/controllers/admin/groups.php
View File

@ -95,7 +95,7 @@ class Groups extends AdminController {
}
public function index( $data = null ) {
Views::view( 'admin.groups.list', self::$group->list() );
Views::view( 'admin.groups.list', self::$group->listPaginated() );
}
public function listmembers( $data = null ) {

2
app/controllers/admin/logins.php
View File

@ -39,7 +39,7 @@ class Logins extends AdminController {
}
public function index() {
return Views::view( 'admin.logs.login_list', self::$log->list( 'login' ) );
return Views::view( 'admin.logs.login_list', self::$log->listPaginated( 'login' ) );
}
public function view( $id = null ) {

6
app/controllers/admin/logs.php
View File

@ -26,8 +26,8 @@ class Logs extends AdminController {
}
public function index( $data = null ) {
Views::view( 'admin.logs.error_list', self::$log->list( 'error' ) );
Views::view( 'admin.logs.admin_list', self::$log->list( 'admin' ) );
Views::view( 'admin.logs.login_list', self::$log->list( 'login' ) );
Views::view( 'admin.logs.error_list', self::$log->listPaginated( 'error' ) );
Views::view( 'admin.logs.admin_list', self::$log->listPaginated( 'admin' ) );
Views::view( 'admin.logs.login_list', self::$log->listPaginated( 'login' ) );
}
}

2
app/controllers/admin/plugins.php
View File

@ -56,7 +56,7 @@ class Plugins extends AdminController {
if ( !Input::exists( 'installHash' ) ) {
return Views::view( 'admin.modules.plugins.enable' );
}
if ( !Plugin::enable( $name ) ) {
if ( ! Plugin::enable( $name ) ) {
Session::flash( 'error', 'There was an error enabling the plugin.' );
} else {
Session::flash( 'success', 'Plugin has been enabled.' );

2
app/controllers/admin/routes.php
View File

@ -88,7 +88,7 @@ class Routes extends AdminController {
}
public function index() {
return Views::view( 'admin.routes.list', self::$routes->list() );
return Views::view( 'admin.routes.list', self::$routes->listPaginated() );
}
public function view( $id = null ) {

2
app/controllers/admin/users.php
View File

@ -140,7 +140,7 @@ class Users extends AdminController {
}
public function index() {
Views::view( 'admin.users.list', self::$user->userList() );
Views::view( 'admin.users.list', self::$user->listPaginated() );
}
public function view( $id = null ) {

2
app/models/group.php
View File

@ -257,7 +257,7 @@ class Group extends DatabaseModel {
if ( $group === false ) {
return false;
}
$members = self::$db->get( 'users', [ 'userGroup', '=', $id ] );
$members = self::$db->getPaginated( 'users', [ 'userGroup', '=', $id ] );
if ( !$members->count() ) {
Debug::info( "list members: Could not find anyone in group: $id" );
return false;

23
app/plugins/blog/models/posts.php
View File

@ -19,9 +19,12 @@ use TheTempusProject\Classes\DatabaseModel;
use TheTempusProject\TheTempusProject as App;
use TheTempusProject\Canary\Classes\CustomException;
use TheTempusProject\Houdini\Classes\Filters;
use TheTempusProject\Plugins\Comments as CommentPlugin;
use TheTempusProject\Models\Comments;
class Posts extends DatabaseModel {
public $tableName = 'posts';
public static $comments = false;
public $databaseMatrix = [
[ 'author', 'int', '11' ],
@ -32,19 +35,14 @@ class Posts extends DatabaseModel {
[ 'content', 'text', '' ],
];
public $resourceMatrix = [
[
'title' => 'Welcome',
'content' => '<p>This is just a simple message to say thank you for installing The Tempus Project. If you have any questions you can find everything through our website <a href="https://TheTempusProject.com">here</a>.</p>',
'author' => 1,
'created' => '{time}',
'edited' => '{time}',
'draft' => 0,
],
];
public function __construct() {
parent::__construct();
if ( class_exists( 'TheTempusProject\Plugins\Comments' ) ) {
$comments = new CommentPlugin;
if ( $comments->checkEnabled() ) {
self::$comments = new Comments;
}
}
}
public function newPost( $title, $post, $draft ) {
@ -161,6 +159,9 @@ class Posts extends DatabaseModel {
if ( isset( $params['stripHtml'] ) && $params['stripHtml'] === true ) {
$instance->contentSummary = strip_tags( $instance->content );
}
if ( self::$comments !== false ) {
$instance->commentCount = self::$comments->count( 'blog', $instance->ID );
}
$instance->content = Filters::applyOne( 'mentions.0', $instance->content, true );
$instance->content = Filters::applyOne( 'hashtags.0', $instance->content, true );
$out[] = $instance;

12
app/plugins/blog/plugin.php
View File

@ -38,6 +38,18 @@ class Blog extends Plugin {
'url' => '{ROOT_URL}blog/index',
],
];
public $resourceMatrix = [
'posts' => [
[
'title' => 'Welcome',
'content' => '<p>This is just a simple message to say thank you for installing The Tempus Project. If you have any questions you can find everything through our website <a href="https://TheTempusProject.com">here</a>.</p>',
'author' => 1,
'created' => '{time}',
'edited' => '{time}',
'draft' => 0,
],
],
];
public $posts;
public function __construct( $load = false ) {

2
app/plugins/comments/plugin.php
View File

@ -54,7 +54,7 @@ class Comments extends Plugin {
],
];
public $resourceMatrix = [
'group' => [
'groups' => [
[
'name' => 'Moderator',
'permissions' => '{"adminAccess":false}',

2
app/plugins/feedback/controllers/admin/feedback.php
View File

@ -53,6 +53,6 @@ class Feedback extends AdminController {
}
public function index( $data = null ) {
Views::view( 'feedback.admin.list', self::$feedback->list() );
Views::view( 'feedback.admin.list', self::$feedback->listPaginated() );
}
}

12
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->get( $this->tableName, [ 'ID', '=', $parent ] );
$messageData = self::$db->getPaginated( $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->get( $this->tableName, $params, 'ID', 'DESC', [ 0, 1 ] );
$messageData = self::$db->getPaginated( $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->get( $this->tableName, [ 'ID', '=', $id ] );
$messageData = self::$db->getPaginated( $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->get( $this->tableName, [ 'ID', '=', $find, 'OR', 'Parent', '=', $find ], 'ID', 'ASC' )->results();
$messageData = self::$db->getPaginated( $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->get(
$messageData = self::$db->getPaginated(
$this->tableName,
[
'parent', '=', 0,
@ -175,7 +175,7 @@ class Message extends DatabaseModel {
$limit = 10;
}
$limit = [ 0, $limit ];
$messageData = self::$db->get(
$messageData = self::$db->getPaginated(
$this->tableName,
[
'parent', '=', 0,

4
app/plugins/notifications/models/notification.php
View File

@ -74,9 +74,9 @@ class Notification extends DatabaseModel {
'expiresAt', '<', time(),
];
if ( empty( $limit ) ) {
$notifications = self::$db->get( $this->tableName, $whereClause );
$notifications = self::$db->getPaginated( $this->tableName, $whereClause );
} else {
$notifications = self::$db->get( $this->tableName, $whereClause, 'ID', 'DESC', [0, $limit] );
$notifications = self::$db->getPaginated( $this->tableName, $whereClause, 'ID', 'DESC', [0, $limit] );
}
if ( !$notifications->count() ) {
Debug::info( 'No Notifications found.' );

3
app/plugins/notifications/views/list.html
View File

@ -27,5 +27,4 @@
</tbody>
</table>
</form>
</div>
{PAGINATION}
</div>

1
app/views/admin/modules/composer/dependencies.html
View File

@ -1,5 +1,4 @@
<legend><h2>Installed Dependencies</h2></legend>
{PAGINATION}
<table class="table table-striped">
<thead>
<tr>

1
app/views/admin/modules/models/list.html
View File

@ -1,5 +1,4 @@
<legend><h2>Installed Models</h2></legend>
{PAGINATION}
<table class="table table-striped">
<thead>
<tr>

1
app/views/admin/modules/plugins/list.html
View File

@ -1,5 +1,4 @@
<legend><h2>Installed Plugins</h2></legend>
{PAGINATION}
<table class="table table-striped">
<thead>
<tr>