configure

diff --git a/include/admin/images.inc.php b/include/admin/images.inc.php
index c94d593839eaf2359c3573186724f247383ad0c6..270588d17374d8528bd00251d1d9b7d6be4a0ca5 100644 (file)
--- a/include/admin/images.inc.php
+++ b/include/admin/images.inc.php
@@ -307,23 +307,72 @@ switch ($serendipity['GET']['adminAction']) {
             return;
         }
 
+        $use_dir   = serendipity_uploadSecure($serendipity['GET']['dir']);
+        $checkpath = array(
+            array(
+                'relpath' => $use_dir
+            )
+        );
+        
+        if (!serendipity_directoryACL($checkpath, 'write')) {
+            return;
+        }
+        
+        if (!empty($serendipity['POST']['save'])) {
+            serendipity_ACLGrant(0, 'directory', 'read', $serendipity['POST']['read_authors'], $use_dir);
+            serendipity_ACLGrant(0, 'directory', 'write', $serendipity['POST']['write_authors'], $use_dir);
+            echo '<div>' . sprintf(SETTINGS_SAVED_AT, serendipity_strftime('%H:%M:%S')) . '</div>';
+        }
+
+        $groups = serendipity_getAllGroups();
+        $read_groups  = serendipity_ACLGet(0, 'directory', 'read', $use_dir);
+        $write_groups = serendipity_ACLGet(0, 'directory', 'write', $use_dir);
+        print_r($read_groups);
+        print_r($write_groups);
 ?>
 
     <strong><?php echo MANAGE_DIRECTORIES ?></strong><br />
     <br />
-    <form method="POST" action="?serendipity[adminModule]=images&serendipity[adminAction]=directoryDoEdit&amp;serendipity[dir]=<?php echo htmlspecialchars($serendipity['GET']['dir']) ?>">
+    <form method="POST" action="?serendipity[adminModule]=images&amp;serendipity[adminAction]=directoryEdit&amp;serendipity[dir]=<?php echo htmlspecialchars($serendipity['GET']['dir']) ?>">
     <?php echo serendipity_setFormToken(); ?> 
-    <input type="hidden" name="serendipity[oldDir]" value="<?php echo serendipity_uploadSecure($serendipity['GET']['dir']); ?>" />
+    <input type="hidden" name="serendipity[oldDir]" value="<?php echo $use_dir; ?>" />
     <table cellpadding="5">
         <tr>
             <td width="100"><strong><?php echo NAME ?></strong></td>
-            <input type="hidden" name="serendipity[newDir]" value="<?php echo serendipity_uploadSecure($serendipity['GET']['dir']); ?>" />
+            <td><input type="text" name="serendipity[newDir]" value="<?php echo $use_dir; ?>" /></td>
+        </tr>
+        <tr>
+            <td><label for="read_authors"><?php echo PERM_READ; ?></label></td>
+            <td>
+                <select size="6" id="read_authors" multiple="multiple" name="serendipity[read_authors][]">
+                    <option value="0" <?php echo (isset($read_groups[0])) ? 'selected="selected"' : ''; ?>><?php echo ALL_AUTHORS; ?></option>
+<?php
+            foreach($groups AS $group) {
+                echo '<option value="' . $group['confkey'] . '" ' . (isset($read_groups[$group['confkey']]) ? 'selected="selected"' : '') . '>' . htmlspecialchars($group['confvalue']) . '</option>' . "\n";
+            }
+?>
+                </select>
+            </td>
+        </tr>
+    
+        <tr>
+            <td><label for="write_authors"><?php echo PERM_WRITE; ?></label></td>
+            <td>
+                <select size="6" id="write_authors" multiple="multiple" name="serendipity[write_authors][]">
+                    <option value="0" <?php echo (isset($write_groups[0])) ? 'selected="selected"' : ''; ?>><?php echo ALL_AUTHORS; ?></option>
+<?php
+            foreach($groups AS $group) {
+                echo '<option value="' . $group['confkey'] . '" ' . (isset($write_groups[$group['confkey']]) ? 'selected="selected"' : '') . '>' . htmlspecialchars($group['confvalue']) . '</option>' . "\n";
+            }
+?>
+                </select>
+            </td>
         </tr>
     </table>
     <br />
     <br />
     <div align="center">
-        <input name="SAVE" value="<?php echo SAVE ?>" class="serendipityPrettyButton" type="submit" />
+        <input name="serendipity[save]" value="<?php echo SAVE ?>" class="serendipityPrettyButton" type="submit" />
     </div>
     </form>
 
@@ -340,7 +389,7 @@ switch ($serendipity['GET']['adminAction']) {
     <?php echo DELETE_DIRECTORY_DESC ?>
     <br />
     <br />
-    <form method="POST" action="?serendipity[adminModule]=images&serendipity[adminAction]=directoryDoDelete&amp;serendipity[dir]=<?php echo htmlspecialchars($serendipity['GET']['dir']) ?>">
+    <form method="POST" action="?serendipity[adminModule]=images&amp;serendipity[adminAction]=directoryDoDelete&amp;serendipity[dir]=<?php echo htmlspecialchars($serendipity['GET']['dir']) ?>">
     <?php echo serendipity_setFormToken(); ?> 
     <table cellpadding="5">
         <tr>
@@ -400,7 +449,7 @@ switch ($serendipity['GET']['adminAction']) {
     <?php echo CREATE_DIRECTORY_DESC ?>
     <br />
     <br />
-    <form method="POST" action="?serendipity[adminModule]=images&serendipity[adminAction]=directoryDoCreate">
+    <form method="POST" action="?serendipity[adminModule]=images&amp;serendipity[adminAction]=directoryDoCreate">
     <?php echo serendipity_setFormToken(); ?> 
     <table cellpadding="5">
         <tr>
@@ -455,7 +504,7 @@ switch ($serendipity['GET']['adminAction']) {
         <?php } ?>
     </table>
     <br />
-    <div><a href="?serendipity[adminModule]=images&serendipity[adminAction]=directoryCreate" class="serendipityPrettyButton"><?php echo CREATE_NEW_DIRECTORY ?></a></div>
+    <div><a href="?serendipity[adminModule]=images&amp;serendipity[adminAction]=directoryCreate" class="serendipityPrettyButton"><?php echo CREATE_NEW_DIRECTORY ?></a></div>
 
 <?php
         break;

diff --git a/include/functions_images.inc.php b/include/functions_images.inc.php
index a957ffcd910a4184c36f07770666d2c621199cf1..b8b0f4e86fa14e0eae3cb3b41ba0b1ba9360f9f3 100644 (file)
--- a/include/functions_images.inc.php
+++ b/include/functions_images.inc.php
@@ -1683,7 +1683,7 @@ function serendipity_dirSlash($type, $dir) {
  */
 function serendipity_directoryACL(&$paths, $type = 'read') {
     global $serendipity;
-    static $debug = false;
+    static $debug = true;
     
     if ($debug) {
         echo "Applying ACL for mode '$type'.<br />\n";
@@ -1749,5 +1749,11 @@ function serendipity_directoryACL(&$paths, $type = 'read') {
                 }
             }
         }
+        
+        if (count($paths) < 1) {
+            return false;
+        }
     }
+    
+    return true;
 }
\ No newline at end of file