diff options
| author | Bharat Mediratta <bharat@menalto.com> | 2008-12-12 00:59:30 +0000 |
|---|---|---|
| committer | Bharat Mediratta <bharat@menalto.com> | 2008-12-12 00:59:30 +0000 |
| commit | 2cf3233f546dfa38521bd9ec280dbec9a9fb7612 (patch) | |
| tree | d002407e665c966bb3ccfeedd672ba77fd26541c /core/views | |
| parent | 0f41cab73201ca2669f4cce88d7e195d7cb28285 (diff) | |
Get rid of all pseudo users and pseudo groups, while preserving all
other functionality. This makes our user/group and access code
fully consistent.
Diffstat (limited to 'core/views')
| -rw-r--r-- | core/views/welcome.html.php | 18 |
1 files changed, 10 insertions, 8 deletions
diff --git a/core/views/welcome.html.php b/core/views/welcome.html.php index c8352592..d412d119 100644 --- a/core/views/welcome.html.php +++ b/core/views/welcome.html.php @@ -283,10 +283,12 @@ <input type="hidden" name="type" value="album"/> </form> </fieldset> + <? if (module::is_installed("rearrange")): ?> <fieldset> <legend>Rearrange</legend> - <?= $rearrange_html ?> + <?= new View("rearrange.html") ?> </fieldset> + <? endif ?> </div> <div id="access" class="activity"> @@ -301,14 +303,14 @@ <? foreach ($users as $user): ?> <li> <?= $user->name ?> - <? if ($user->id != user::ADMIN): ?> + <? if (!$user->admin): ?> <?= html::anchor("welcome/delete_user/$user->id", "[x]") ?> <? endif ?> <ul> <? foreach ($user->groups as $group): ?> <li> <?= $group->name ?> - <? if ($group->id != group::REGISTERED_USERS): ?> + <? if (!$group->special): ?> <?= html::anchor("welcome/remove_from_group/$group->id/$user->id", "[x]") ?> <? endif ?> </li> @@ -337,7 +339,7 @@ <? foreach ($groups as $group): ?> <li> <?= $group->name ?> - <? if ($group->id != group::REGISTERED_USERS): ?> + <? if (!$group->special): ?> <?= html::anchor("welcome/delete_group/$group->id", "[x]") ?> <? endif ?> </li> @@ -365,15 +367,15 @@ <?= html::anchor("albums/{$current->album->id}", $current->album->title) ?> » <? foreach (array("view", "edit") as $perm): ?> - <? if (access::group_can(group::EVERYBODY, $perm, $current->album)): ?> - <?= html::anchor("welcome/deny_perm/0/$perm/{$current->album->id}", strtoupper($perm), array("class" => "allowed")) ?> + <? if (access::group_can(group::everybody(), $perm, $current->album)): ?> + <?= html::anchor("welcome/deny_perm/1/$perm/{$current->album->id}", strtoupper($perm), array("class" => "allowed")) ?> <? else: ?> - <?= html::anchor("welcome/add_perm/0/$perm/{$current->album->id}", strtolower($perm), array("class" => "denied")) ?> + <?= html::anchor("welcome/add_perm/1/$perm/{$current->album->id}", strtolower($perm), array("class" => "denied")) ?> <? endif ?> <? endforeach ?> <? if ($current->album->id != 1): ?> <span class="understate"> - (<?= html::anchor("welcome/reset_all_perms/0/{$current->album->id}", "reset") ?>) + (<?= html::anchor("welcome/reset_all_perms/1/{$current->album->id}", "reset") ?>) </span> <? endif; ?> <? $stack[] = "CLOSE"; ?> |