Allow to duplicate groups

diff --git a/docs/NEWS b/docs/NEWS
index 304ea21cf2667b4eb234e4db97a1d8a8418898e4..923e181949b8fba24c320d99243dd68e6a6c44ae 100644 (file)
--- a/docs/NEWS
+++ b/docs/NEWS
@@ -3,6 +3,9 @@
 Version 1.1-alpha1()
 ------------------------------------------------------------------------
 
+   * Allow to create new groups from existing ones, by editing them
+     and clicking on "Create new group". (garvinhicking)
+
    * Statistic plugin update by Shrikee: Graphically display visitors,
      bot banning.
 

diff --git a/include/admin/groups.inc.php b/include/admin/groups.inc.php
index aebf74986f6b02e409638e753b29615cff722d3d..30b34df97e8b477833cea48998c34ecc48924910 100644 (file)
--- a/include/admin/groups.inc.php
+++ b/include/admin/groups.inc.php
@@ -20,7 +20,7 @@ if (isset($_POST['DELETE_YES']) && serendipity_checkFormToken()) {
 /* Save new group */
 if (isset($_POST['SAVE_NEW']) && serendipity_checkFormToken()) {
     $serendipity['POST']['group'] = serendipity_addGroup($serendipity['POST']['name']);
-    $perms = serendipity_getAllPermissionNames();    
+    $perms = serendipity_getAllPermissionNames();
     serendipity_updateGroupConfig($serendipity['POST']['group'], $perms, $serendipity['POST']);
     printf('<div class="serendipityAdminMsgSuccess">' . CREATED_GROUP . '</div>', '#' . $serendipity['POST']['group'] . ', ' . $serendipity['POST']['name']);
 }
@@ -28,7 +28,7 @@ if (isset($_POST['SAVE_NEW']) && serendipity_checkFormToken()) {
 
 /* Edit a group */
 if (isset($_POST['SAVE_EDIT']) && serendipity_checkFormToken()) {
-    $perms = serendipity_getAllPermissionNames();    
+    $perms = serendipity_getAllPermissionNames();
     serendipity_updateGroupConfig($serendipity['POST']['group'], $perms, $serendipity['POST']);
     printf('<div class="serendipityAdminMsgSuccess">' . MODIFIED_GROUP . '</div>', $serendipity['POST']['name']);
 }
@@ -132,7 +132,7 @@ foreach($allusers AS $user) {
         <td colspan="2">&nbsp;</td>
     </tr>
 <?php
-    $perms = serendipity_getAllPermissionNames();    
+    $perms = serendipity_getAllPermissionNames();
     ksort($perms);
     foreach($perms AS $perm => $userlevels) {
         if (isset($from[$perm]) && $from[$perm] === 'true') {
@@ -144,7 +144,7 @@ foreach($allusers AS $user) {
         if (!isset($section)) {
             $section = $perm;
         }
-        
+
         if ($section != $perm && substr($perm, 0, strlen($section)) == $section) {
             $indent  = '&nbsp;&nbsp;';
             $indentB = '';
@@ -159,7 +159,7 @@ foreach($allusers AS $user) {
         } else {
             $permname = $perm;
         }
-        
+
         if (!serendipity_checkPermission($perm)) {
             echo "<tr>\n";
             echo "<td>$indent" . htmlspecialchars($permname) . "</td>\n";
@@ -178,6 +178,8 @@ foreach($allusers AS $user) {
 <?php
 if ($serendipity['GET']['adminAction'] == 'edit') { ?>
         <input type="submit" name="SAVE_EDIT"   value="<?php echo SAVE; ?>" class="serendipityPrettyButton" />
+        <?php echo ' - ' . WORD_OR . ' - ' ?>
+        <input type="submit" name="SAVE_NEW"   value="<?php echo CREATE_NEW_GROUP; ?>" class="serendipityPrettyButton" />
 <?php } else { ?>
         <input type="submit" name="SAVE_NEW" value="<?php echo CREATE_NEW_GROUP; ?>" class="serendipityPrettyButton" />
 <?php } ?>

diff --git a/serendipity_admin.php b/serendipity_admin.php
index 71297351c0a706864f2d24e6a29aa9e080725e5e..5d5cd98030fad2a21fe064b4ea427bdf2b9a3789 100644 (file)
--- a/serendipity_admin.php
+++ b/serendipity_admin.php
@@ -165,18 +165,22 @@ if (!isset($serendipity['serendipityPath']) || IS_installed === false || IS_up2d
 <?php } ?>
                     </ul>
                     <br />
-<?php if (serendipity_checkPermission('adminEntries')) { ?>
                     <ul class="serendipitySideBarMenu">
+<?php if (serendipity_checkPermission('adminEntries') || serendipity_checkPermission('adminEntriesPlugins')) { ?>
                         <li class="serendipitySideBarMenuHead"><?php echo ADMIN_ENTRIES ?></li>
+<?php if (serendipity_checkPermission('adminEntries')) { ?>
                         <li><a href="serendipity_admin.php?serendipity[adminModule]=entries&amp;serendipity[adminAction]=new"><?php echo NEW_ENTRY; ?></a></li>
                         <li><a href="serendipity_admin.php?serendipity[adminModule]=entries&amp;serendipity[adminAction]=editSelect"><?php echo EDIT_ENTRIES; ?></a></li>
+<?php } ?>
 <?php if (serendipity_checkPermission('adminComments')) { ?>
                         <li><a href="serendipity_admin.php?serendipity[adminModule]=comments"><?php echo COMMENTS; ?></a></li>
 <?php } ?>
 <?php if (serendipity_checkPermission('adminCategories')) { ?>
                         <li><a href="serendipity_admin.php?serendipity[adminModule]=category&amp;serendipity[adminAction]=view"><?php echo CATEGORIES; ?></a></li>
 <?php } ?>
+<?php if (serendipity_checkPermission('adminEntries') || serendipity_checkPermission('adminEntriesPlugins')) { ?>
                         <?php if ($serendipity['no_create'] !== true) serendipity_plugin_api::hook_event('backend_sidebar_entries', $serendipity); ?>
+<?php } ?>
                     </ul>
 <?php } ?>
 <?php if (serendipity_checkPermission('adminImages')) { ?>