Drop $authorid as discussed

References #264

docs/NEWS

@@ -3,8 +3,11 @@
 Version 2.1 ()
 ------------------------------------------------------------------------
 
+    * Issue #264: Drop $authorid for permissions based on images
+      instead of directories, it was not used anymore
+      
     * Some small enhancements to the error reporting
-
+    
 Version 2.0.1 ()
 ------------------------------------------------------------------------
    * Fixed entry editor JS not emitting a 'No tags' msg in taxonomy

include/admin/images.inc.php

@@ -168,7 +168,7 @@ switch ($serendipity['GET']['adminAction']) {
 
         $messages[] = '<span class="image_add">' . ADDING_IMAGE . '</span>';
 
-        $authorid = (isset($serendipity['POST']['all_authors']) && $serendipity['POST']['all_authors'] == 'true') ? '0' : $serendipity['authorid'];
+        $authorid = 0; // Only use access-control based on media directories, not images themselves
 
         $new_media = array();
 

templates/2k11/admin/media_upload.tpl

@@ -82,8 +82,6 @@
 
     {serendipity_hookPlugin hook="backend_image_addform" hookAll=true}
     <div class="form_buttons">
-        <input id="all_authors" name="serendipity[all_authors]" type="hidden" value="true" checked="checked">
-
         <input class="check_inputs" type="submit" value="{$CONST.GO}">
         {if $media.manage}
             <input class="check_inputs" name="go_properties" type="submit" value="{$CONST.GO_ADD_PROPERTIES|escape}">

templates/2k11/admin/serendipity_editor.js.tpl

@@ -1407,7 +1407,6 @@ $(function() {
                                     data.append('serendipity[adminAction]', 'add');
                                     data.append('serendipity[token]', $('input[name*="serendipity[token]"]').val());
                                     data.append('serendipity[target_filename][1]', $('input[name*="serendipity[target_filename][1]"]').val());
-                                    data.append('serendipity[all_authors]', true);
                                     var type = file.type;
                                     if (type == "image/bmp") {
                                         {* bmp is not supported *}

templates/default/admin/media_upload.tpl

@@ -83,7 +83,6 @@
 
         <div style="text-align: center; margin-top: 15px; margin-bottom: 15px">
             <input class="serendipityPrettyButton input_button" type="button" value="{$CONST.IMAGE_MORE_INPUT}" onclick="hideForeign(); addUploadField()" /><br />
-            <input type="hidden" name="serendipity[all_authors]" value="true" checked="checked" id="all_authors" />
             <br />
             <input onclick="checkInputs();" type="submit" value="{$CONST.GO}" class="serendipityPrettyButton input_button" />
             - {$CONST.WORD_OR} -