mirror of
https://github.com/monstra-cms/monstra.git
synced 2025-08-06 13:16:54 +02:00
Users Plugin: Improvements
This commit is contained in:
@@ -1,14 +1,5 @@
|
|||||||
<?php
|
<?php
|
||||||
|
|
||||||
// Check if is user is logged in then set variables for welcome button
|
|
||||||
if (Session::exists('user_id')) {
|
|
||||||
$user_id = Session::get('user_id');
|
|
||||||
$user_login = Session::get('user_login');
|
|
||||||
} else {
|
|
||||||
$user_id = '';
|
|
||||||
$user_login = '';
|
|
||||||
}
|
|
||||||
|
|
||||||
// Add plugin navigation link
|
// Add plugin navigation link
|
||||||
Navigation::add(__('Users', 'users'), 'system', 'users', 2);
|
Navigation::add(__('Users', 'users'), 'system', 'users', 2);
|
||||||
|
|
||||||
|
@@ -21,8 +21,12 @@ Plugin::register( __FILE__,
|
|||||||
'users',
|
'users',
|
||||||
'box');
|
'box');
|
||||||
|
|
||||||
// Include Users Admin
|
if (Session::exists('user_role') && in_array(Session::get('user_role'), array('admin', 'editor'))) {
|
||||||
Plugin::Admin('users', 'box');
|
|
||||||
|
// Include Users Admin
|
||||||
|
Plugin::Admin('users', 'box');
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
// Add Plugin Javascript
|
// Add Plugin Javascript
|
||||||
Javascript::add('plugins/box/users/js/users.js', 'backend');
|
Javascript::add('plugins/box/users/js/users.js', 'backend');
|
||||||
|
@@ -1,13 +1,12 @@
|
|||||||
<!-- Users_add -->
|
<!-- Users_add -->
|
||||||
<h2><?php echo __('New User Registration', 'users'); ?></h2>
|
<h2><?php echo __('New User Registration', 'users'); ?></h2>
|
||||||
<?php
|
<?php
|
||||||
|
|
||||||
echo (
|
echo (
|
||||||
Html::br().
|
Html::br().
|
||||||
Form::open().
|
Form::open().
|
||||||
Form::hidden('csrf', Security::token())
|
Form::hidden('csrf', Security::token())
|
||||||
);
|
);
|
||||||
?>
|
?>
|
||||||
<div class="row">
|
<div class="row">
|
||||||
<div class="col-md-6">
|
<div class="col-md-6">
|
||||||
<div class="form-group">
|
<div class="form-group">
|
||||||
@@ -60,5 +59,4 @@
|
|||||||
);
|
);
|
||||||
?>
|
?>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
|
||||||
</div>
|
</div>
|
@@ -16,7 +16,7 @@
|
|||||||
Form::hidden('user_id', Request::get('user_id'))
|
Form::hidden('user_id', Request::get('user_id'))
|
||||||
);
|
);
|
||||||
|
|
||||||
if (isset($_SESSION['user_role']) && in_array($_SESSION['user_role'], array('admin'))) {
|
if (Session::exists('user_role') && in_array(Session::get('user_role'), array('admin'))) {
|
||||||
?>
|
?>
|
||||||
<div class="form-group">
|
<div class="form-group">
|
||||||
<?php
|
<?php
|
||||||
@@ -78,7 +78,7 @@
|
|||||||
?>
|
?>
|
||||||
</div>
|
</div>
|
||||||
<?php
|
<?php
|
||||||
if (isset($_SESSION['user_role']) && in_array($_SESSION['user_role'], array('admin'))) {
|
if (Session::exists('user_role') && in_array(Session::get('user_role'), array('admin'))) {
|
||||||
?>
|
?>
|
||||||
<div class="form-group">
|
<div class="form-group">
|
||||||
<?php
|
<?php
|
||||||
@@ -88,7 +88,7 @@
|
|||||||
</div>
|
</div>
|
||||||
<?php
|
<?php
|
||||||
} else {
|
} else {
|
||||||
echo Form::hidden('role', $_SESSION['user_role']);
|
echo Form::hidden('role', Session::get('user_role'));
|
||||||
}
|
}
|
||||||
|
|
||||||
echo (
|
echo (
|
||||||
@@ -127,7 +127,6 @@
|
|||||||
|
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<div style="clear:both;"></div>
|
|
||||||
|
|
||||||
<?php
|
<?php
|
||||||
} else {
|
} else {
|
||||||
|
@@ -47,7 +47,7 @@
|
|||||||
<div class="pull-right">
|
<div class="pull-right">
|
||||||
<?php echo Html::anchor(__('Edit', 'users'), 'index.php?id=users&action=edit&user_id='.$user['id'], array('class' => 'btn btn-primary')); ?>
|
<?php echo Html::anchor(__('Edit', 'users'), 'index.php?id=users&action=edit&user_id='.$user['id'], array('class' => 'btn btn-primary')); ?>
|
||||||
<?php
|
<?php
|
||||||
if ((int)$user['id'] != (int)$_SESSION['user_id']) {
|
if ((int)$user['id'] != (int)Session::get('user_id')) {
|
||||||
echo Html::anchor(__('Delete', 'users'),
|
echo Html::anchor(__('Delete', 'users'),
|
||||||
'index.php?id=users&action=delete&user_id='.$user['id'].'&token='.Security::token(),
|
'index.php?id=users&action=delete&user_id='.$user['id'].'&token='.Security::token(),
|
||||||
array('class' => 'btn btn-danger', 'onclick' => "return confirmDelete('".__('Delete user: :user', 'users', array(':user' => Html::toText($user['login'])))."')"));
|
array('class' => 'btn btn-danger', 'onclick' => "return confirmDelete('".__('Delete user: :user', 'users', array(':user' => Html::toText($user['login'])))."')"));
|
||||||
|
Reference in New Issue
Block a user