AS1024/Kanboard-Prod
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add helpers for the user session and fix bug edit_user admin checkbox

Browse Source
This commit is contained in:
Frédéric Guillot
2014-02-23 20:25:49 -05:00
parent b664175b04
commit 2298594455
5 changed files with 18 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
lib/helper.php
View File

@@ -2,6 +2,16 @@
namespace Helper; namespace Helper;
function is_current_user($user_id)
{
return $_SESSION['user']['id'] == $user_id;
}
function is_admin()
{
return $_SESSION['user']['is_admin'] == 1;
}
function markdown($text) function markdown($text)
{ {
require_once __DIR__.'/../vendor/Michelf/MarkdownExtra.inc.php'; require_once __DIR__.'/../vendor/Michelf/MarkdownExtra.inc.php';

6
templates/project_index.php
View File

@@ -1,7 +1,7 @@
<section id="main"> <section id="main">
<div class="page-header"> <div class="page-header">
<h2><?= t('Projects') ?><span id="page-counter"> (<?= $nb_projects ?>)</span></h2> <h2><?= t('Projects') ?><span id="page-counter"> (<?= $nb_projects ?>)</span></h2>
<?php if ($_SESSION['user']['is_admin'] == 1): ?> <?php if (Helper\is_admin()): ?>
<ul> <ul>
<li><a href="?controller=project&amp;action=create"><?= t('New project') ?></a></li> <li><a href="?controller=project&amp;action=create"><?= t('New project') ?></a></li>
</ul> </ul>
@@ -18,7 +18,7 @@
<th><?= t('Tasks') ?></th> <th><?= t('Tasks') ?></th>
<th><?= t('Board') ?></th> <th><?= t('Board') ?></th>
<?php if ($_SESSION['user']['is_admin'] == 1): ?> <?php if (Helper\is_admin()): ?>
<th><?= t('Actions') ?></th> <th><?= t('Actions') ?></th>
<?php endif ?> <?php endif ?>
</tr> </tr>
@@ -56,7 +56,7 @@
<?php endforeach ?> <?php endforeach ?>
</ul> </ul>
</td> </td>
<?php if ($_SESSION['user']['is_admin'] == 1): ?> <?php if (Helper\is_admin()): ?>
<td> <td>
<ul> <ul>
<li> <li>

2
templates/project_tasks.php
View File

@@ -4,7 +4,7 @@
<ul> <ul>
<li><a href="?controller=board&amp;action=show&amp;project_id=<?= $project['id'] ?>"><?= t('Back to the board') ?></a></li> <li><a href="?controller=board&amp;action=show&amp;project_id=<?= $project['id'] ?>"><?= t('Back to the board') ?></a></li>
<li><a href="?controller=project&amp;action=index"><?= t('List of projects') ?></a></li> <li><a href="?controller=project&amp;action=index"><?= t('List of projects') ?></a></li>
<?php if ($_SESSION['user']['is_admin'] == 1): ?> <?php if (Helper\is_admin()): ?>
<li><a href="?controller=project&amp;action=create"><?= t('New project') ?></a></li> <li><a href="?controller=project&amp;action=create"><?= t('New project') ?></a></li>
<?php endif ?> <?php endif ?>
</ul> </ul>

2
templates/user_edit.php
View File

@@ -22,7 +22,7 @@
<?= Helper\form_label(t('Default Project'), 'default_project_id') ?> <?= Helper\form_label(t('Default Project'), 'default_project_id') ?>
<?= Helper\form_select('default_project_id', $projects, $values, $errors) ?><br/> <?= Helper\form_select('default_project_id', $projects, $values, $errors) ?><br/>
<?php if ($values['is_admin'] == 1): ?> <?php if (Helper\is_admin()): ?>
<?= Helper\form_checkbox('is_admin', t('Administrator'), 1, isset($values['is_admin']) && $values['is_admin'] == 1 ? true : false) ?> <?= Helper\form_checkbox('is_admin', t('Administrator'), 1, isset($values['is_admin']) && $values['is_admin'] == 1 ? true : false) ?>
<?php endif ?> <?php endif ?>

6
templates/user_index.php
View File

@@ -1,7 +1,7 @@
<section id="main"> <section id="main">
<div class="page-header"> <div class="page-header">
<h2><?= t('Users') ?><span id="page-counter"> (<?= $nb_users ?>)</span></h2> <h2><?= t('Users') ?><span id="page-counter"> (<?= $nb_users ?>)</span></h2>
<?php if ($_SESSION['user']['is_admin'] == 1): ?> <?php if (Helper\is_admin()): ?>
<ul> <ul>
<li><a href="?controller=user&amp;action=create"><?= t('New user') ?></a></li> <li><a href="?controller=user&amp;action=create"><?= t('New user') ?></a></li>
</ul> </ul>
@@ -30,10 +30,10 @@
<?= (isset($user['default_project_id']) && isset($projects[$user['default_project_id']])) ? $projects[$user['default_project_id']] : t('None'); ?> <?= (isset($user['default_project_id']) && isset($projects[$user['default_project_id']])) ? $projects[$user['default_project_id']] : t('None'); ?>
</td> </td>
<td> <td>
<?php if ($_SESSION['user']['is_admin'] == 1 || $_SESSION['user']['id'] == $user['id']): ?> <?php if (Helper\is_admin() || Helper\is_current_user($user['id'])): ?>
<a href="?controller=user&amp;action=edit&amp;user_id=<?= $user['id'] ?>"><?= t('edit') ?></a> <a href="?controller=user&amp;action=edit&amp;user_id=<?= $user['id'] ?>"><?= t('edit') ?></a>
<?php endif ?> <?php endif ?>
<?php if ($_SESSION['user']['is_admin'] == 1): ?> <?php if (Helper\is_admin()): ?>
<?php if (count($users) > 1): ?> <?php if (count($users) > 1): ?>
<?= t('or') ?> <?= t('or') ?>
<a href="?controller=user&amp;action=confirm&amp;user_id=<?= $user['id'] ?>"><?= t('remove') ?></a> <a href="?controller=user&amp;action=confirm&amp;user_id=<?= $user['id'] ?>"><?= t('remove') ?></a>