Changeset 7927

Timestamp:

05/13/08 22:12:52 (6 months ago)

Author:

ryan

Message:

Don't pass image list via GET. Fetch images remotely. Load photo tab via AJAX. see #6813

Files:

• trunk/wp-admin/quick-post.php (modified) (7 diffs)
• trunk/wp-includes/link-template.php (modified) (2 diffs)

trunk/wp-admin/quick-post.php

@@ -22 +22 @@
-            $content = '<blockquote>' . $_REQUEST['content'];
-            if ($_REQUEST['content2']) {
-   $content = $content .
+$content .=
-                $content = $content . '<p>' . $_REQUEST['content2']; 
-            }
@@ -44 +44 @@
-            $content = '<object width="425" height="350"><param name="movie" value="http://www.youtube.com/v/' . $video_id . '"></param><param name="wmode" value="transparent"></param><embed src="http://www.youtube.com/v/' . $video_id . '" type="application/x-shockwave-flash" wmode="transparent" width="425" height="350"></embed></object>';
-            if ($_REQUEST['content2'])
-= $content .
+.=
-            break;              
-    }
@@ -68 +68 @@
-}
-
+function get_images_from_uri($uri) {
+    $content = wp_remote_fopen($uri);
+    if ( false === $content )
+        return '';
+
+    $pattern = '/src=[\'"]?([^\'" >]+)[\'" >]/'; 
+    preg_match_all($pattern, $content, $matches);
+    if ( empty($matches[1]) )
+        return '';
+
+    $from_host = parse_url($uri);
+    $from_host = $from_host['host'];
+    $from_host = explode('.', $from_host);
+    $count = count($from_host);
+    $from_host = $from_host[$count - 2] . '.' . $from_host[$count - 1];
+
+    $sources = array();
+    foreach ($matches[1] as $src) {
+        if ( false !== strpos($src, '&') )
+            continue;
+
+        $img_host = parse_url($src);
+        $img_host = $img_host['host'];
+        if ( false === strpos($img_host, $from_host) )
+            continue;
+
+        $sources[] = $src;
+    }
+    return "'" . implode("','", $sources) . "'";
+}
+
+// Clean up the data being passed in
+$title = stripslashes($_GET['t']);
+
+if ( !empty($_GET['load']) && 'photo' == $_GET['load'] ) {
+?>
+    <script type="text/javascript">
+    <?php if ( user_can_richedit() ) {
+        $language = ( '' == get_locale() ) ? 'en' : strtolower( substr(get_locale(), 0, 2) );
+    ?>
+
+            tinyMCE.init({
+                mode: "textareas",
+                editor_selector: "mceEditor",
+                language : "<?php echo $language; ?>",
+                width: "100%",
+                theme : "advanced",
+                theme_advanced_buttons1 : "bold,italic,underline,blockquote,separator,strikethrough,bullist,numlist,undo,redo,link,unlink",
+                theme_advanced_buttons2 : "",
+                theme_advanced_buttons3 : "",
+                theme_advanced_toolbar_location : "top",
+                theme_advanced_toolbar_align : "left",
+                theme_advanced_statusbar_location : "bottom",
+                theme_advanced_resizing : true,
+                theme_advanced_resize_horizontal : false,
+                skin : "wp_theme",
+                dialog_type : "modal",
+                relative_urls : false,
+                remove_script_host : false,
+                convert_urls : false,
+                apply_source_formatting : false,
+                remove_linebreaks : true,
+                accessibility_focus : false,
+                tab_focus : ":next",
+                plugins : "safari,inlinepopups"
+            });
+    <?php } ?>
+            var last = null;
+            function pick(img) {
+                if (last) last.style.backgroundColor = '#f4f4f4';
+                if (img) {
+                    document.getElementById('photo_src').value = img.src;
+                    img.style.backgroundColor = '#44f';
+                }
+                last = img;
+                return false;
+            }
+
+            jQuery(document).ready(function() {
+                var img, img_tag, aspect, w, h, skip, i, strtoappend = "";
+                var my_src = [<?php echo get_images_from_uri(clean_url($_GET['u'])); ?>];
+
+                for (i = 0; i < my_src.length; i++) {
+                    img = new Image();
+                    img.src = my_src[i];
+                    img_attr = 'id="img' + i + '" onclick="pick(this);"';
+                    skip = false;
+                    if (img.width && img.height) {
+                        if (img.width * img.height < 2500) skip = true;
+                        aspect = img.width / img.height;
+                        if (aspect > 1) {
+                            // Image is wide
+                            scale = 75 / img.width;
+                        } else {
+                            // Image is tall or square
+                            scale = 75 / img.height;
+                        }
+                        if (scale < 1) {
+                            w = parseInt(img.width * scale);
+                            h = parseInt(img.height * scale);
+                        } else {
+                            w = img.width;
+                            h = img.height;
+                        }
+                        img_attr += ' style="width: ' + w + 'px; height: ' + h + 'px;"';
+                    }
+                    if (!skip) {
+                        strtoappend += '<a href="' + img.src + '" title="" class="thickbox"><img src="' + img.src + '" ' + img_attr + '/></a>'
+                    }
+                }
+                jQuery('#img_container').html(strtoappend);
+
+                tb_init('a.thickbox, area.thickbox, input.thickbox');//pass where to apply thickbox
+            });
+    </script>
+
+            <form action="quick-post.php?action=post" method="post" id="photo_form">
+                <?php wp_nonce_field('quick-post') ?>
+                <input type="hidden" name="source" value="bookmarklet"/>
+                <input type="hidden" name="post_type" value="photo"/>
+                <div id="posting">
+                    <h2><?php _e('Post Title') ?></h2>
+                    <input name="post_title" id="post_title" class="text" value="<?php echo attribute_escape($title);?>"/>
+
+                    <h2><?php _e('Caption') ?></h2>
+                    <div class="editor-container">
+                        <textarea name="content" id="photo_post_two" style="height:130px;width:100%;" class="mceEditor"><?php echo stripslashes($_GET['s']);?>
+                        <br>&lt;a href="<?php echo clean_url($_GET['u']);?>"&gt;<?php echo $title;?>&lt;/a&gt;</textarea>
+                    </div>
+
+                    <h2><?php _e('Photo URL') ?></h2>
+                    <input name="photo_src" id="photo_src" class="text" onkeydown="pick(0);"/>
+
+                    <style type="text/css">
+                        #img_container img {
+                            width:          75px;
+                            height:         75px;
+                            padding:        2px;
+                            background-color: #f4f4f4;
+                            margin-right:   7px; 
+                            margin-bottom:  7px; 
+                            cursor:         pointer;
+                        }
+                    </style>
+                    <div id="img_container" style="border:solid 1px #ccc; background-color:#f4f4f4; padding:5px; width:370px; margin-top:10px; overflow:auto; height:100px;">
+                    </div>
+
+                    <h2><?php _e('Link Photo to following URL') ?></h2><?php _e('(leave blank to leave the photo unlinked)') ?>
+                    <input name="photo_link" id="photo_link" class="text" value="<?php echo attribute_escape($_GET['u']);?>"/>
+
+                    <?php tag_input(); ?>
+      
+                    <div>         
+                        <input type="submit" value="<?php _e('Create Photo') ?>" style="margin-top:15px;"   onclick="document.getElementById('photo_saving').style.display = '';"/>&nbsp;&nbsp;
+
+                        <a href="#" onclick="if (confirm('<?php _e('Are you sure?') ?>')) { self.close(); } else { return false; }" style="color:#007BFF;"><?php _e('Cancel') ?></a>&nbsp;&nbsp;
+                        <img src="/images/bookmarklet_loader.gif" alt="" id="photo_saving" style="width:16px; height:16px; vertical-align:-4px; display:none;"/>
+                    </div>
+                </div>
+                <div id="categories">
+                    <h2><?php _e('Categories') ?></h2>
+                    <ul id="categorychecklist" class="list:category categorychecklist form-no-clear">
+                    <?php wp_category_checklist($post_ID) ?>
+                    </ul>
+                </div>
+            </form>
+<?php
+exit;
+}
-?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
@@ -128 +297 @@
-    jQuery(document).ready(function() {
-    <?php if ( preg_match("/youtube\.com\/watch/i", $_GET['u']) ) { ?>
-4 })({
+3,
-    <?php } elseif ( preg_match("/flickr\.com/i", $_GET['u']) ) { ?>
-2 })({
+1,
-    <?php } else { ?>
-
+selected: 1, 
-    <?php } ?>
-    });
-
+
-    </script>
-</head>
@@ -151 +320 @@
-}
-
-// Clean up the data being passed in
-$title = stripslashes($_GET['t']);
-
-?>
-    <div id="container">
@@ -159 +325 @@
-        <ul>
-            <li><a href="#section-1"><span><?php _e('Text/Link') ?></span></a></li>
-#section-2
+<?php echo add_query_arg('load', 'photo') ?>
-            <li><a href="#section-3"><span><?php _e('Quote') ?></span></a></li>
-            <li><a href="#section-4"><span><?php _e('Video') ?></span></a></li>
@@ -194 +360 @@
-                </div>
-             </form>
-        </div>
-
-        <!-- Photo -->
-        <div id="section-2">
-            <form action="quick-post.php?action=post" method="post" id="photo_form">
-                <?php wp_nonce_field('quick-post') ?>
-                <input type="hidden" name="source" value="bookmarklet"/>
-                <input type="hidden" name="post_type" value="photo"/>
-                <div id="posting">
-                    <h2><?php _e('Post Title') ?></h2>
-                    <input name="post_title" id="post_title" class="text" value="<?php echo attribute_escape($title);?>"/>
-
-                    <h2><?php _e('Caption') ?></h2>
-                    <div class="editor-container">
-                        <textarea name="content" id="photo_post_two" style="height:130px;width:100%;" class="mceEditor"><?php echo "" .stripslashes($_GET['s']);?>
-                        <br>&lt;a href="<?php echo clean_url($_GET['u']);?>"&gt;<?php echo $title;?>&lt;/a&gt;</textarea>
-                    </div>
-
-                    <h2><?php _e('Photo URL') ?></h2>
-                    <input name="photo_src" id="photo_src" class="text" onkeydown="pick(0);"/>
-
-                    <style type="text/css">
-                        #img_container img {
-                            width:          75px;
-                            height:         75px;
-                            padding:        2px;
-                            background-color: #f4f4f4;
-                            margin-right:   7px; 
-                            margin-bottom:  7px; 
-                            cursor:         pointer;
-                        }
-                    </style>
-
-                    <div id="img_container" style="border:solid 1px #ccc; background-color:#f4f4f4; padding:5px; width:370px; margin-top:10px; overflow:auto; height:100px;">
-                        <script type="text/javascript">
-                            var img, img_tag, aspect, w, h, skip, i, strtoappend = "";
-                            var my_src = ['<?php echo str_replace(",", "','", rtrim($_GET['imagez'], ","));?>'];
-                            var last = null;
-
-                            function pick(img) {
-                                if (last) last.style.backgroundColor = '#f4f4f4';
-                                if (img) {
-                                    document.getElementById('photo_src').value = img.src;
-                                    img.style.backgroundColor = '#44f';
-                                }
-                                last = img;
-                                return false;
-                            }
-                            for (i = 0; i < my_src.length; i++) {
-                                img = new Image();
-                                img.src = my_src[i];
-                                img_attr = 'id="img' + i + '" onclick="pick(this);"';
-                                skip = false;
-                                if (img.width && img.height) {
-                                    if (img.width * img.height < 2500) skip = true;
-                                    aspect = img.width / img.height;
-                                    if (aspect > 1) {
-                                        // Image is wide
-                                        scale = 75 / img.width;
-                                    } else {
-                                        // Image is tall or square
-                                        scale = 75 / img.height;
-                                    }
-                                    if (scale < 1) {
-                                        w = parseInt(img.width * scale);
-                                        h = parseInt(img.height * scale);
-                                    } else {
-                                        w = img.width;
-                                        h = img.height;
-                                    }
-                                    img_attr += ' style="width: ' + w + 'px; height: ' + h + 'px;"';
-                                }
-                                if (!skip) {
-                                    strtoappend += '<a href="' + img.src + '" title="" class="thickbox"><img src="' + img.src + '" ' + img_attr + '/></a>'
-                                }
-                            }
-                            if (jQuery.browser.safari) {
-                                document.getElementById('img_container').innerHTML = strtoappend;  
-                            } else {
-                                document.write(strtoappend);                
-                            }
-                        </script>
-                    </div>
-
-                    <h2><?php _e('Link Photo to following URL') ?></h2><?php _e('(leave blank to leave the photo unlinked)') ?>
-                    <input name="photo_link" id="photo_link" class="text" value="<?php echo attribute_escape($_GET['u']);?>"/>
-
-                    <?php tag_input(); ?>
-      
-                    <div>         
-                        <input type="submit" value="<?php _e('Create Photo') ?>" style="margin-top:15px;"   onclick="document.getElementById('photo_saving').style.display = '';"/>&nbsp;&nbsp;
-
-                        <a href="#" onclick="if (confirm('<?php _e('Are you sure?') ?>')) { self.close(); } else { return false; }" style="color:#007BFF;"><?php _e('Cancel') ?></a>&nbsp;&nbsp;
-                        <img src="/images/bookmarklet_loader.gif" alt="" id="photo_saving" style="width:16px; height:16px; vertical-align:-4px; display:none;"/>
-                    </div>
-                </div>
-                <div id="categories">
-                    <h2><?php _e('Categories') ?></h2>
-                    <ul id="categorychecklist" class="list:category categorychecklist form-no-clear">
-                    <?php wp_category_checklist($post_ID) ?>
-                    </ul>
-                </div>
-            </form>
-        </div>
-

trunk/wp-includes/link-template.php

@@ -745 +745 @@
-function get_shortcut_link() {
-    $link = "javascript:
-            var imgstr='';
-            var reg=new RegExp('&');
-            for(i=0;i<document.images.length;i++){
-                if(! reg.test(document.images[i].src)){
-                    imgstr = imgstr + document.images[i].src + ',';
-                }
-            }
-            var d=document;
-            var w=window;
@@ -761 +754 @@
-            var l=d.location;
-            var e=encodeURIComponent;
-
-
+
-            var t= '&t=' + e(d.title);
-            var s= '&s=' + e(s);
-
+
+
-            function a(){
-                if(!w.open(g,'t','toolbar=0,resizable=0,scrollbars=1,status=1,width=700,height=500')){