mbirth/LuckyCoinkydink
1
0
Fork 0
Code Issues Pull Requests Activity

upport 44dfccc - make group permission name split into parts

Browse Source 
to be styleable as in 1.7, but here still unchanged by tags, since this may need to change some styles.
This commit is contained in:
Ian 2014-02-27 12:04:21 +01:00
parent ac22fec171
commit ce56d05d5d
2 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
include/admin/groups.inc.php
View File

@ -1,4 +1,4 @@
<?php # $Id:$ <?php #
if (IN_serendipity !== true) { if (IN_serendipity !== true) {
die ('Don\'t hack!'); die ('Don\'t hack!');
@ -28,7 +28,6 @@ if (isset($_POST['SAVE_NEW']) && serendipity_checkFormToken()) {
$data['group'] = $group; $data['group'] = $group;
} }
/* Edit a group */ /* Edit a group */
if (isset($_POST['SAVE_EDIT']) && serendipity_checkFormToken()) { if (isset($_POST['SAVE_EDIT']) && serendipity_checkFormToken()) {
$perms = serendipity_getAllPermissionNames(); $perms = serendipity_getAllPermissionNames();
@ -54,9 +53,6 @@ if ( $serendipity['GET']['adminAction'] != 'delete' ) {
$data['deleteFormToken'] = serendipity_setFormToken('url'); $data['deleteFormToken'] = serendipity_setFormToken('url');
} }
if ($serendipity['GET']['adminAction'] == 'edit' || isset($_POST['NEW']) || $serendipity['GET']['adminAction'] == 'new') { if ($serendipity['GET']['adminAction'] == 'edit' || isset($_POST['NEW']) || $serendipity['GET']['adminAction'] == 'new') {
if (isset($_POST['NEW']) || $serendipity['GET']['adminAction'] == 'new') { if (isset($_POST['NEW']) || $serendipity['GET']['adminAction'] == 'new') {
$data['new'] = true; $data['new'] = true;
@ -88,7 +84,9 @@ if ($serendipity['GET']['adminAction'] == 'edit' || isset($_POST['NEW']) || $ser
$data['perms'] = $perms; $data['perms'] = $perms;
foreach($perms AS $perm => $userlevels) { foreach($perms AS $perm => $userlevels) {
if (defined('PERMISSION_' . strtoupper($perm))) { if (defined('PERMISSION_' . strtoupper($perm))) {
$data['perms'][$perm]['permission_name'] = constant('PERMISSION_' . strtoupper($perm)); list($name, $note) = explode(":", constant('PERMISSION_' . strtoupper($perm)));
$data['perms'][$perm]['permission_name'] = $name;
$data['perms'][$perm]['permission_note'] = $note;
} else { } else {
$data['perms'][$perm]['permission_name'] = $perm; $data['perms'][$perm]['permission_name'] = $perm;
} }

2
templates/2k11/admin/groups.inc.tpl
View File

@ -81,7 +81,7 @@
{else} {else}
<div class="form_check"> <div class="form_check">
<input id="{{$perm@key}|escape:"html"}" name="serendipity[{{$perm@key}|escape:"html"}]" type="checkbox" value="true"{if isset({$from.{$perm@key}}) && {$from.{$perm@key}} == "true"} checked="checked"{/if}> <input id="{{$perm@key}|escape:"html"}" name="serendipity[{{$perm@key}|escape:"html"}]" type="checkbox" value="true"{if isset({$from.{$perm@key}}) && {$from.{$perm@key}} == "true"} checked="checked"{/if}>
<label for="{{$perm@key}|escape:"html"}">{$perm.permission_name|escape:"html"}</label> <label for="{{$perm@key}|escape:"html"}">{$perm.permission_name|escape:"html"}: {$perm.permission_note|escape:"html"}</label>
</div> </div>
{/if} {/if}
{/foreach} {/foreach}