diff options
Diffstat (limited to 'app/Template/user')
-rw-r--r-- | app/Template/user/edit.php | 2 | ||||
-rw-r--r-- | app/Template/user/external.php | 4 | ||||
-rw-r--r-- | app/Template/user/index.php | 2 | ||||
-rw-r--r-- | app/Template/user/layout.php | 2 | ||||
-rw-r--r-- | app/Template/user/sidebar.php | 4 |
5 files changed, 7 insertions, 7 deletions
diff --git a/app/Template/user/edit.php b/app/Template/user/edit.php index 6766f952..68b264ec 100644 --- a/app/Template/user/edit.php +++ b/app/Template/user/edit.php @@ -20,7 +20,7 @@ <?= $this->formLabel(t('Default project'), 'default_project_id') ?> <?= $this->formSelect('default_project_id', $projects, $values, $errors) ?><br/> - <?php if ($this->acl->isAdminUser()): ?> + <?php if ($this->userSession->isAdmin()): ?> <?= $this->formCheckbox('is_admin', t('Administrator'), 1, isset($values['is_admin']) && $values['is_admin'] == 1 ? true : false) ?><br/> <?php endif ?> diff --git a/app/Template/user/external.php b/app/Template/user/external.php index 6ee1e459..b4cea156 100644 --- a/app/Template/user/external.php +++ b/app/Template/user/external.php @@ -6,7 +6,7 @@ <h3><i class="fa fa-google"></i> <?= t('Google Account') ?></h3> <p class="listing"> - <?php if ($this->acl->isCurrentUser($user['id'])): ?> + <?php if ($this->userSession->isCurrentUser($user['id'])): ?> <?php if (empty($user['google_id'])): ?> <?= $this->a(t('Link my Google Account'), 'user', 'google', array(), true) ?> <?php else: ?> @@ -22,7 +22,7 @@ <h3><i class="fa fa-github"></i> <?= t('Github Account') ?></h3> <p class="listing"> - <?php if ($this->acl->isCurrentUser($user['id'])): ?> + <?php if ($this->userSession->isCurrentUser($user['id'])): ?> <?php if (empty($user['github_id'])): ?> <?= $this->a(t('Link my GitHub Account'), 'user', 'github', array(), true) ?> <?php else: ?> diff --git a/app/Template/user/index.php b/app/Template/user/index.php index a6da9f65..e4729501 100644 --- a/app/Template/user/index.php +++ b/app/Template/user/index.php @@ -1,6 +1,6 @@ <section id="main"> <div class="page-header"> - <?php if ($this->acl->isAdminUser()): ?> + <?php if ($this->userSession->isAdmin()): ?> <ul> <li><i class="fa fa-plus fa-fw"></i><?= $this->a(t('New user'), 'user', 'create') ?></li> </ul> diff --git a/app/Template/user/layout.php b/app/Template/user/layout.php index 94610000..a5a78a3f 100644 --- a/app/Template/user/layout.php +++ b/app/Template/user/layout.php @@ -1,6 +1,6 @@ <section id="main"> <div class="page-header"> - <?php if ($this->acl->isAdminUser()): ?> + <?php if ($this->userSession->isAdmin()): ?> <ul> <li><i class="fa fa-user fa-fw"></i><?= $this->a(t('All users'), 'user', 'index') ?></li> <li><i class="fa fa-plus fa-fw"></i><?= $this->a(t('New user'), 'user', 'create') ?></li> diff --git a/app/Template/user/sidebar.php b/app/Template/user/sidebar.php index 5b7abc34..f74c8b01 100644 --- a/app/Template/user/sidebar.php +++ b/app/Template/user/sidebar.php @@ -5,7 +5,7 @@ <?= $this->a(t('Summary'), 'user', 'show', array('user_id' => $user['id'])) ?> </li> - <?php if ($this->acl->isAdminUser() || $this->acl->isCurrentUser($user['id'])): ?> + <?php if ($this->userSession->isAdmin() || $this->userSession->isCurrentUser($user['id'])): ?> <li> <?= $this->a(t('Edit profile'), 'user', 'edit', array('user_id' => $user['id'])) ?> </li> @@ -30,7 +30,7 @@ </li> <?php endif ?> - <?php if ($this->acl->isAdminUser() && ! $this->acl->isCurrentUser($user['id'])): ?> + <?php if ($this->userSession->isAdmin() && ! $this->userSession->isCurrentUser($user['id'])): ?> <li> <?= $this->a(t('Remove'), 'user', 'remove', array('user_id' => $user['id'])) ?> </li> |