Changeset 10855

Timestamp:

04/01/2009 05:41:52 AM (16 years ago)

Author:

markjaquith

Message:

Press This UI, Quoting fixes, plus ability for Contributors to use Press This. props noel. fixes #9434

Location:

trunk/wp-admin

Files:

• css/press-this.css (modified) (1 diff)
• press-this.php (modified) (5 diffs)
• tools.php (modified) (1 diff)

trunk/wp-admin/css/press-this.css

@@ -15 +15 @@
     padding-top: 4px;
     background: #444 !important;
+}
+
+.tagchecklist span a {
+background: transparent url(../images/xit.gif) no-repeat 0 0;
 }
 

trunk/wp-admin/press-this.php

@@ -11 +11 @@
 header('Content-Type: ' . get_option('html_type') . '; charset=' . get_option('blog_charset'));
 
-if ( ! current_user_can('publish_posts') ) wp_die( __( 'Cheatin’ uh?' ) );
+if ( ! current_user_can('edit_posts') ) wp_die( __( 'Cheatin’ uh?' ) );
 
 /**
@@ -65 +65 @@
     $content = $_REQUEST['content'];
 
-    if($_REQUEST['photo_src'])
+    if( $_REQUEST['photo_src'] && current_user_can('upload_files') )
         foreach( (array) $_REQUEST['photo_src'] as $key => $image)
             // see if files exist in content - we don't want to upload non-used selected files.
             if( strpos($_REQUEST['content'], $image) !== false ) {
                 $upload = media_sideload_image($image, $post_ID, $_REQUEST['photo_description'][$key]);
-
-                // Replace the POSTED content <img> with correct uploaded ones.
-                // escape quote for matching
-                $quoted = preg_quote2($image);
-                if( !is_wp_error($upload) ) $content = preg_replace('/<img ([^>]*)src=(\"|\')'.$quoted.'(\2)([^>\/]*)\/*>/is', $upload, $content);
+                
+                // Replace the POSTED content <img> with correct uploaded ones. Regex contains fix for Magic Quotes
+                if( !is_wp_error($upload) ) $content = preg_replace('/<img ([^>]*)src=\\\?(\"|\')'.preg_quote2($image).'\\\?(\2)([^>\/]*)\/*>/is', $upload, $content);
             }
 
@@ -462 +460 @@
             <!-- This div holds the photo metadata -->
             <div class="photolist"></div>
-
+            
+            <div id="submitdiv" class="stuffbox">
+                <h3><?php _e('Publish') ?></h3>
+                <div class="inside">
+                    <p>
+                        <input class="button" type="submit" name="draft" value="<?php _e('Save Draft') ?>" id="save" />
+                        <?php if ( current_user_can('publish_posts') ) { ?>
+                            <input class="button-primary" type="submit" name="publish" value="<?php _e('Publish') ?>" id="publish" />
+                        <?php } else { ?>
+                            <br /><br /><input class="button-primary" type="submit" name="review" value="<?php _e('Submit for Review') ?>" id="review" />
+                        <?php } ?>
+                        <img src="images/loading-publish.gif" alt="" id="saving" style="display:none;" />
+                    </p>
+                </div>
+            </div>
+            
             <div id="categorydiv" class="stuffbox">
                 <h3><?php _e('Categories') ?></h3>
@@ -503 +516 @@
                 </div>
             </div>
-            <div id="submitdiv" class="stuffbox">
-                <h3><?php _e('Publish') ?></h3>
-                <div class="inside">
-                    <p>
-                        <input class="button" type="submit" name="draft" value="<?php _e('Save Draft') ?>" id="save" />
-                        <input class="button-primary" type="submit" name="publish" value="<?php _e('Publish') ?>" id="publish" />
-                        <img src="images/loading-publish.gif" alt="" id="saving" style="display:none;" />
-                    </p>
-                </div>
-            </div>
         </div>
     </div>
@@ -531 +534 @@
         <div class="postdivrich">
             <ul id="actions">
+                
                 <li id="photo_button">
-                    Add: <a title="<?php _e('Insert an Image'); ?>" href="#">
+                    Add: <?php if ( current_user_can('upload_files') ) { ?><a title="<?php _e('Insert an Image'); ?>" href="#">
 <img alt="<?php _e('Insert an Image'); ?>" src="images/media-button-image.gif"/></a>
+                    <?php } ?>
                 </li>
                 <li id="video_button">

trunk/wp-admin/tools.php

@@ -78 +78 @@
 </div>
 
-<?php if ( current_user_can('publish_posts') ) : ?>
+<?php if ( current_user_can('edit_posts') ) : ?>
 <div class="tool-box">
     <h3 class="title"><?php _e('Press This') ?></h3>