mirror of
https://github.com/WordPress/WordPress.git
synced 2024-06-25 22:35:02 +02:00
Rename image-uploading to inline-uploading. Props skeltoac. fixes #1834
git-svn-id: http://svn.automattic.com/wordpress/trunk@2994 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
ryan
parent
344b1dcee0
commit
acfd349d19
|
|
@ -214,7 +214,7 @@ else
|
|||
|
||||
<?php
|
||||
$uploading_iframe_ID = (0 == $post_ID ? $temp_ID : $post_ID);
|
||||
$uploading_iframe_src = "image-uploading.php?action=view&post=$uploading_iframe_ID";
|
||||
$uploading_iframe_src = "inline-uploading.php?action=view&post=$uploading_iframe_ID";
|
||||
$uploading_iframe_src = apply_filters('uploading_iframe_src', $uploading_iframe_src);
|
||||
if ( false != $uploading_iframe_src )
|
||||
echo '<iframe id="uploading" border="0" src="' . $uploading_iframe_src . '">' . __('This feature requires iframe support.') . '</iframe>';
|
||||
|
|
|
|||
|
|
@ -148,10 +148,12 @@ edCanvas = document.getElementById('content');
|
|||
</p>
|
||||
|
||||
<?php
|
||||
$frame_src = 'image-uploading.php?action=view&post=' . ((0 == $post_ID) ? $temp_ID : $post_ID);
|
||||
$frame_src = apply_filters('upload_frame_src', $frame_src, ((0 == $post_ID) ? $temp_ID : $post_ID));
|
||||
$uploading_iframe_ID = (0 == $post_ID ? $temp_ID : $post_ID);
|
||||
$uploading_iframe_src = "inline-uploading.php?action=view&post=$uploading_iframe_ID";
|
||||
$uploading_iframe_src = apply_filters('uploading_iframe_src', $uploading_iframe_src);
|
||||
if ( false != $uploading_iframe_src )
|
||||
echo '<iframe id="uploading" border="0" src="' . $uploading_iframe_src . '">' . __('This feature requires iframe support.') . '</iframe>';
|
||||
?>
|
||||
<iframe border="0" src="<?php echo $frame_src; ?>" id="imageup"><?php _e('This feature requires iframe support.'); ?></iframe>
|
||||
|
||||
<div id="advancedstuff" class="dbx-group">
|
||||
|
||||
|
|
|
|||
|
|
@ -1,624 +0,0 @@
|
|||
<?php
|
||||
|
||||
require_once('admin.php');
|
||||
|
||||
if (!current_user_can('edit_posts'))
|
||||
die(__('You do not have permission to edit posts.'));
|
||||
|
||||
$wpvarstoreset = array('action', 'post', 'all', 'last', 'link', 'sort', 'start', 'imgtitle', 'descr', 'object', 'flickrtag');
|
||||
|
||||
for ($i=0; $i<count($wpvarstoreset); $i += 1) {
|
||||
$wpvar = $wpvarstoreset[$i];
|
||||
if (!isset($$wpvar)) {
|
||||
if (empty($_POST["$wpvar"])) {
|
||||
if (empty($_GET["$wpvar"])) {
|
||||
$$wpvar = '';
|
||||
} else {
|
||||
$$wpvar = $_GET["$wpvar"];
|
||||
}
|
||||
} else {
|
||||
$$wpvar = $_POST["$wpvar"];
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
$post = (int) $post;
|
||||
$images_width = 1;
|
||||
|
||||
function get_udims($width, $height) {
|
||||
if ( $height <= 96 && $width <= 128 )
|
||||
return array($width, $height);
|
||||
elseif ( $width / $height > 4 / 3 )
|
||||
return array(128, (int) ($height / $width * 128));
|
||||
else
|
||||
return array((int) ($width / $height * 96), 96);
|
||||
}
|
||||
|
||||
switch($action) {
|
||||
case 'delete':
|
||||
|
||||
wp_delete_object($object);
|
||||
|
||||
header("Location: ".basename(__FILE__)."?post=$post&all=$all&action=view&start=$start");
|
||||
die;
|
||||
|
||||
case 'save':
|
||||
|
||||
$overrides = array('action'=>'save');
|
||||
|
||||
$file = wp_handle_upload($_FILES['image'], $overrides);
|
||||
|
||||
if ( isset($file['error']) )
|
||||
die($file['error'] . '<a href="' . basename(__FILE__) . '?action=upload&post="' . $post . '">Back to Image Uploading</a>');
|
||||
|
||||
$url = $file['url'];
|
||||
$file = $file['file'];
|
||||
$filename = basename($file);
|
||||
|
||||
// Construct the object array
|
||||
$object = array(
|
||||
'post_title' => $imgtitle ? $imgtitle : $filename,
|
||||
'post_content' => $descr,
|
||||
'post_status' => 'object',
|
||||
'post_parent' => $post,
|
||||
'post_type' => $_FILES['image']['type'],
|
||||
'guid' => $url
|
||||
);
|
||||
|
||||
// Save the data
|
||||
$id = wp_attach_object($object, $post);
|
||||
|
||||
// Generate the object's postmeta.
|
||||
$imagesize = getimagesize($file);
|
||||
$imagedata['width'] = $imagesize['0'];
|
||||
$imagedata['height'] = $imagesize['1'];
|
||||
list($uwidth, $uheight) = get_udims($imagedata['width'], $imagedata['height']);
|
||||
$imagedata['hwstring_small'] = "height='$uheight' width='$uwidth'";
|
||||
$imagedata['file'] = $file;
|
||||
$imagedata['thumb'] = "thumb-$filename";
|
||||
|
||||
add_post_meta($id, 'imagedata', $imagedata);
|
||||
|
||||
if ( $imagedata['width'] * $imagedata['height'] < 3 * 1024 * 1024 ) {
|
||||
if ( $imagedata['width'] > 128 && $imagedata['width'] >= $imagedata['height'] * 4 / 3 )
|
||||
$error = wp_create_thumbnail($file['file'], 128);
|
||||
elseif ( $imagedata['height'] > 96 )
|
||||
$error = wp_create_thumbnail($file, 96);
|
||||
}
|
||||
|
||||
header("Location: ".basename(__FILE__)."?post=$post&all=$all&action=view&last=true");
|
||||
die;
|
||||
|
||||
case 'upload':
|
||||
|
||||
$current_1 = ' class="current"';
|
||||
$back = $next = false;
|
||||
break;
|
||||
|
||||
case 'view':
|
||||
|
||||
// How many images do we show? How many do we query?
|
||||
$num = 5;
|
||||
$double = $num * 2;
|
||||
|
||||
if ( $post && empty($all) ) {
|
||||
$and_post = "AND post_parent = '$post'";
|
||||
$current_2 = ' class="current"';
|
||||
} else {
|
||||
$current_3 = ' class="current"';
|
||||
}
|
||||
|
||||
if ( $last )
|
||||
$start = $wpdb->get_var("SELECT count(ID) FROM $wpdb->posts WHERE post_status = 'object' AND left(post_type, 5) = 'image' $and_post") - $num;
|
||||
else
|
||||
$start = (int) $start;
|
||||
|
||||
if ( $start < 0 )
|
||||
$start = 0;
|
||||
|
||||
if ( '' == $sort )
|
||||
$sort = "ID";
|
||||
|
||||
$images = $wpdb->get_results("SELECT ID, post_date, post_title, guid FROM $wpdb->posts WHERE post_status = 'object' AND left(post_type, 5) = 'image' $and_post ORDER BY $sort LIMIT $start, $double", ARRAY_A);
|
||||
|
||||
if ( count($images) > $num ) {
|
||||
$next = $start + count($images) - $num;
|
||||
} else {
|
||||
$next = false;
|
||||
}
|
||||
|
||||
if ( $start > 0 ) {
|
||||
$back = $start - $num;
|
||||
if ( $back < 1 )
|
||||
$back = '0';
|
||||
} else {
|
||||
$back = false;
|
||||
}
|
||||
|
||||
$i = 0;
|
||||
$uwidth_sum = 0;
|
||||
$images_html = '';
|
||||
$images_style = '';
|
||||
$images_script = '';
|
||||
if ( count($images) > 0 ) {
|
||||
$images = array_slice( $images, 0, $num );
|
||||
$__delete = __('DELETE');
|
||||
$__subpost_on = __('SUBPOST <strong>ON</strong>');
|
||||
$__subpost_off = __('SUBPOST <strong>OFF</strong>');
|
||||
$__thumbnail_on = __('THUMBNAIL <strong>ON</strong>');
|
||||
$__thumbnail_off = __('THUMBNAIL <strong>OFF</strong>');
|
||||
$__no_thumbnail = __('<del>THUMBNAIL</del>');
|
||||
$__close = __('CLOSE');
|
||||
$__confirmdelete = __('Delete this photo from the server?');
|
||||
$__nothumb = __('There is no thumbnail associated with this photo.');
|
||||
$images_script .= "subposton = '$__subpost_on';\nsubpostoff = '$__subpost_off';\n";
|
||||
$images_script .= "thumbnailon = '$__thumbnail_on';\nthumbnailoff = '$__thumbnail_off';\n";
|
||||
foreach ( $images as $key => $image ) {
|
||||
$meta = get_post_meta($image['ID'], 'imagedata', true);
|
||||
if (!is_array($meta)) {
|
||||
wp_delete_object($image['ID']);
|
||||
continue;
|
||||
}
|
||||
$image = array_merge($image, $meta);
|
||||
if ( ($image['width'] > 128 || $image['height'] > 96) && !empty($image['thumb']) && file_exists(dirname($image['file']).'/'.$image['thumb']) ) {
|
||||
$src = str_replace(basename($image['guid']), '', $image['guid']) . $image['thumb'];
|
||||
$images_script .= "src".$i."a = '$src';\nsrc".$i."b = '".$image['guid']."';\n";
|
||||
$thumb = 'true';
|
||||
$thumbtext = $__thumbnail_on;
|
||||
} else {
|
||||
$src = $image['guid'];
|
||||
$thumb = 'false';
|
||||
$thumbtext = $__no_thumbnail;
|
||||
}
|
||||
list($image['uwidth'], $image['uheight']) = get_udims($image['width'], $image['height']);
|
||||
$height_width = 'height="'.$image['uheight'].'" width="'.$image['uwidth'].'"';
|
||||
$uwidth_sum += 128;
|
||||
$xpadding = (128 - $image['uwidth']) / 2;
|
||||
$ypadding = (96 - $image['uheight']) / 2;
|
||||
$object = $image['ID'];
|
||||
$images_style .= "#target$i img { padding: {$ypadding}px {$xpadding}px; }\n";
|
||||
$href = get_subpost_link($object);
|
||||
$images_script .= "href".$i."a = '$href';\nhref".$i."b = '{$image['guid']}';\n";
|
||||
$images_html .= <<<HERE
|
||||
<div id='target$i' class='imagewrap left'>
|
||||
<div id='popup$i' class='popup'>
|
||||
<a id="L$i" onclick="toggleLink($i);return false;" href="javascript:void();">$__subpost_on</a>
|
||||
<a id="I$i" onclick="if($thumb)toggleImage($i);else alert('$__nothumb');return false;" href="javascript:void();">$thumbtext</a>
|
||||
<a onclick="return confirm('$__confirmdelete')" href="image-uploading.php?action=delete&object=$object&all=$all&start=$start&post=$post">$__delete</a>
|
||||
<a onclick="popup.style.display='none';return false;" href="javascript:void()">$__close</a>
|
||||
</div>
|
||||
<a id="link$i" class="imagelink" href="$href" onclick="imagePopup($i);return false;" title="{$image['post_title']}">
|
||||
<img id='image$i' src='$src' alt='{$image['post_title']}' $height_width />
|
||||
</a>
|
||||
</div>
|
||||
HERE;
|
||||
$i++;
|
||||
}
|
||||
}
|
||||
|
||||
$images_width = $uwidth_sum + ( count($images) * 5 ) + 30;
|
||||
|
||||
break;
|
||||
|
||||
case 'flickr':
|
||||
|
||||
require_once ABSPATH . WPINC . '/class-snoopy.php';
|
||||
|
||||
function flickr_api_call($method, $params = '') {
|
||||
$api_key = '7cd7b7dea9c9d3069caf99d12471008e'; // An API key reserved for WordPress
|
||||
$searchurl = 'http://www.flickr.com/services/rest/?method=' . $method . '&api_key=' . $api_key . '&' . $params;
|
||||
$client = new Snoopy();
|
||||
$client->agent = 'WordPress/Flickr Browser';
|
||||
$client->read_timeout = 2;
|
||||
$client->use_gzip = true;
|
||||
@$client->fetch($searchurl);
|
||||
return $client->results;
|
||||
}
|
||||
|
||||
// How many images do we show? How many do we query?
|
||||
$num = 5;
|
||||
$double = $num * 2;
|
||||
|
||||
$flickr_user_id = get_user_option('flickr_userid');
|
||||
if($flickr_user_id == '') {
|
||||
$flickr_username = get_user_option('flickr_username');
|
||||
$user_xml = flickr_api_call('flickr.people.findByUsername', "username={$flickr_username}");
|
||||
if(preg_match('/nsid="(.*?)">/', $user_xml, $matches)) {
|
||||
$flickr_user_id = $matches[1];
|
||||
}
|
||||
else die("Failed to find Flickr ID for '$flickr_username'"); // Oh, dear - no Flickr user_id!
|
||||
|
||||
// Store the found Flickr user_id in usermeta...
|
||||
// Don't forget on the options page to update the user_id along with the username!
|
||||
update_user_option($current_user->id, 'flickr_userid', $flickr_user_id, true);
|
||||
}
|
||||
|
||||
// Fetch photo list from Flickr
|
||||
$ustart = $start + 1;
|
||||
//$photos_xml = flickr_api_call('flickr.photos.search', array('per_page' => $num, 'user_id' => $flickr_user_id));
|
||||
if($flickrtag == '') {
|
||||
$all = '0';
|
||||
$photos_xml = flickr_api_call('flickr.people.getPublicPhotos', "per_page={$num}&user_id={$flickr_user_id}&page={$ustart}");
|
||||
}
|
||||
else {
|
||||
$photos_xml = flickr_api_call('flickr.photos.search', "per_page={$num}&user_id={$flickr_user_id}&page={$ustart}&tags={$flickrtag}");
|
||||
$all = '0&flickrtag=' . $flickrtag;
|
||||
}
|
||||
//echo "<pre>" . htmlentities($photos_xml) . "</pre>"; // Displays the XML returned by Flickr for the photo list
|
||||
|
||||
//Get Page Count
|
||||
preg_match('/<photos.*pages="([0-9]+)"/', $photos_xml, $page_counta);
|
||||
$page_count = $page_counta[1];
|
||||
if($page_count == 0) {
|
||||
$back = false;
|
||||
$next = false;
|
||||
break;
|
||||
}
|
||||
if($start < $page_count) $next = $start + 1; else $next = false;
|
||||
if($start > 0) $back = $start - 1; else $back = false;
|
||||
if($last != '') {
|
||||
$photos_xml = flickr_api_call('flickr.people.getPublicPhotos', "per_page={$num}&user_id={$flickr_user_id}&page={$page_count}");
|
||||
$back = $page_count -1;
|
||||
$next = false;
|
||||
}
|
||||
|
||||
//Get Photos
|
||||
preg_match_all('/<photo.*?id="([0-9]+)".*?secret="([0-9a-f]+)".*?server="([0-9]+)".*?title="([^"]*)".*?\/>/', $photos_xml, $matches, PREG_SET_ORDER);
|
||||
foreach($matches as $match) {
|
||||
$img['post_title'] = $match[4];
|
||||
|
||||
$sizes_xml = flickr_api_call('flickr.photos.getSizes', "photo_id={$match[1]}");
|
||||
preg_match_all('/<size.*?label="([^"]+)".*?width="([0-9]+)".*?height="([0-9]+)".*?source="([^"]+)".*?\/>/', $sizes_xml, $sizes, PREG_SET_ORDER);
|
||||
|
||||
$max_size = '';
|
||||
foreach($sizes as $size) {
|
||||
$img_size[$size[1]]['width'] = $size[2];
|
||||
$img_size[$size[1]]['height'] = $size[3];
|
||||
$img_size[$size[1]]['url'] = $size[4];
|
||||
if($max_size == '' || $img_size[$size[1]]['width'] > $img_size[$max_size]['width']) {
|
||||
$max_size = $size[1];
|
||||
}
|
||||
}
|
||||
|
||||
$images[] = array(
|
||||
'post_title' => $match[4],
|
||||
'thumbnail' => $img_size['Thumbnail']['url'],
|
||||
'full' => $img_size[$max_size]['url'],
|
||||
'href' => "http://flickr.com/photos/{$flickr_user_id}/{$match[1]}/",
|
||||
'width' => $img_size['Thumbnail']['width'],
|
||||
'height' => $img_size['Thumbnail']['height'],
|
||||
'size_info' => $img_size,
|
||||
);
|
||||
}
|
||||
|
||||
$current_flickr = ' class="current"';
|
||||
|
||||
$__use_size = __('Use %s');
|
||||
$__close = __('CLOSE');
|
||||
|
||||
$images_script .= "var flickr_src = new Array();\n";
|
||||
|
||||
$i=0;
|
||||
foreach($images as $image) {
|
||||
list($uwidth, $uheight) = get_udims($image['width'], $image['height']);
|
||||
$xpadding = (128 - $uwidth) / 2;
|
||||
$ypadding = (96 - $uheight) / 2;
|
||||
$height_width = 'height="'.$uheight.'" width="'.$uwidth.'"';
|
||||
$images_style .= "#target$i img { padding: {$ypadding}px {$xpadding}px; }\n";
|
||||
$images_html .= "
|
||||
<div id='target$i' class='imagewrap left'>
|
||||
<div id='popup$i' class='popup'>
|
||||
";
|
||||
|
||||
$images_script .= "flickr_src[$i] = new Array();\n";
|
||||
foreach($image['size_info'] as $szkey => $size) {
|
||||
$images_script .= "flickr_src[$i]['{$szkey}']= '{$size['url']}';\n";
|
||||
$use = sprintf($__use_size, $szkey);
|
||||
$prefix = ($szkey == 'Thumbnail') ? '<strong>':'';
|
||||
$postfix = ($szkey == 'Thumbnail') ? '</strong>':'';
|
||||
$images_html .= "<a id=\"I{$i}_{$szkey}\" onclick=\"toggleSize($i,'$szkey');return false;\" href=\"javascript:void();\">{$prefix}{$use}{$postfix}</a>\n";
|
||||
}
|
||||
$images_html .= "
|
||||
<a onclick=\"popup.style.display='none';return false;\" href=\"javascript:void()\">$__close</a>
|
||||
</div>
|
||||
<a id=\"link$i\" class=\"imagelink\" href=\"{$image['href']}\" onclick=\"imagePopup($i);return false;\" title=\"{$image['post_title']}\">
|
||||
<img id=\"image$i\" src=\"{$image['thumbnail']}\" alt=\"{$image['post_title']}\" $height_width />
|
||||
</a>
|
||||
</div>
|
||||
";
|
||||
$i++;
|
||||
}
|
||||
|
||||
$images_width = ( count($images) * 133 ) + 5;
|
||||
|
||||
break;
|
||||
|
||||
default:
|
||||
die('This script was not meant to be called directly.');
|
||||
}
|
||||
|
||||
?>
|
||||
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
|
||||
<html xmlns="http://www.w3.org/1999/xhtml">
|
||||
<head>
|
||||
<meta http-equiv="imagetoolbar" content="no" />
|
||||
<script type="text/javascript">
|
||||
/* Define any variables we'll need, such as alternate URLs. */
|
||||
<?php echo $images_script; ?>
|
||||
|
||||
function validateImageName() {
|
||||
/* This is more for convenience than security. Server-side validation is very thorough.*/
|
||||
obj = document.getElementById('upload');
|
||||
r = /.jpg$|.gif$|.png$/i;
|
||||
if ( obj.value.match(r) )
|
||||
return true;
|
||||
alert('Please select a JPG, PNG or GIF file.');
|
||||
return false;
|
||||
}
|
||||
function cancelUpload() {
|
||||
o = document.getElementById('uploadForm');
|
||||
o.method = 'GET';
|
||||
o.action.value = 'view';
|
||||
o.submit();
|
||||
}
|
||||
function imagePopup(i) {
|
||||
if ( popup )
|
||||
popup.style.display = 'none';
|
||||
target = document.getElementById('target'+i);
|
||||
popup = document.getElementById('popup'+i);
|
||||
//popup.style.top = (target.offsetTop + 3) + 'px';
|
||||
popup.style.left = (target.offsetLeft) + 'px';
|
||||
popup.style.display = 'block';
|
||||
}
|
||||
function init() {
|
||||
popup = false;
|
||||
}
|
||||
function toggleLink(n) {
|
||||
o=document.getElementById('link'+n);
|
||||
oi=document.getElementById('L'+n);
|
||||
if ( oi.innerHTML == subposton ) {
|
||||
o.href = eval('href'+n+'b');
|
||||
oi.innerHTML = subpostoff;
|
||||
} else {
|
||||
o.href = eval('href'+n+'a');
|
||||
oi.innerHTML = subposton;
|
||||
}
|
||||
}
|
||||
function toggleImage(n) {
|
||||
o = document.getElementById('image'+n);
|
||||
oi = document.getElementById('I'+n);
|
||||
if ( oi.innerHTML == thumbnailon ) {
|
||||
o.src = eval('src'+n+'b');
|
||||
oi.innerHTML = thumbnailoff;
|
||||
} else {
|
||||
o.src = eval('src'+n+'a');
|
||||
oi.innerHTML = thumbnailon;
|
||||
}
|
||||
}
|
||||
function toggleSize(n,sz) {
|
||||
o = document.getElementById('image'+n);
|
||||
oi = document.getElementById('popup'+n);
|
||||
o.src = flickr_src[n][sz];
|
||||
if (!document.getElementsByTagName) return;
|
||||
var anchors = document.getElementsByTagName("a");
|
||||
var re_id = 'I'+n+'_'; // /i[0-9]+_.+/i;
|
||||
var re_strip = /<.*?>/i;
|
||||
for (var i=0; i< anchors.length; i++) {
|
||||
var anchor = anchors[i];
|
||||
if (anchor.getAttribute("href") && anchor.id.match(re_id))
|
||||
anchor.innerHTML = anchor.innerHTML.replace(re_strip, '');
|
||||
}
|
||||
var anchor = document.getElementById('I'+n+'_'+sz);
|
||||
anchor.innerHTML = '<strong>' + anchor.innerHTML + '</strong>';
|
||||
}
|
||||
</script>
|
||||
<style type="text/css">
|
||||
body {
|
||||
font: 13px "Lucida Grande", "Lucida Sans Unicode", Tahoma, Verdana;
|
||||
border: none;
|
||||
margin: 0px;
|
||||
height: 150px;
|
||||
background: rgb(223, 232, 241);
|
||||
}
|
||||
form {
|
||||
margin: 6px 2px 0px 6px;
|
||||
}
|
||||
#wrap {
|
||||
clear: both;
|
||||
margin: 0px;
|
||||
padding: 0px;
|
||||
height: 133px;
|
||||
width: 100%;
|
||||
overflow: auto;
|
||||
}
|
||||
#images {
|
||||
clear: both;
|
||||
margin: 0px;
|
||||
padding: 5px 15px;
|
||||
height: 96px;
|
||||
white-space: nowrap;
|
||||
width: <?php echo $images_width; ?>px;
|
||||
}
|
||||
#images img {
|
||||
background-color: rgb(209, 226, 239);
|
||||
}
|
||||
<?php echo $images_style; ?>
|
||||
.imagewrap {
|
||||
margin-right: 5px;
|
||||
height: 96px;
|
||||
overflow: hidden;
|
||||
}
|
||||
.imagewrap * {
|
||||
margin: 0px;
|
||||
padding: 0px;
|
||||
border: 0px;
|
||||
}
|
||||
.imagewrap a, .imagewrap a img, .imagewrap a:hover img, .imagewrap a:visited img, .imagewrap a:active img {
|
||||
text-decoration: none;
|
||||
float: left;
|
||||
/*display: block;*/
|
||||
text-align: center;
|
||||
}
|
||||
#menu {
|
||||
margin: 0px;
|
||||
list-style: none;
|
||||
background: rgb(109, 166, 209);
|
||||
padding: 4px 0px 0px 8px;
|
||||
text-align: left;
|
||||
border-bottom: 3px solid rgb(68, 138, 189);
|
||||
}
|
||||
#menu li {
|
||||
display: inline;
|
||||
margin: 0px;
|
||||
}
|
||||
#menu a, #menu a:visited, #menu a:active {
|
||||
padding: 1px 3px 3px;
|
||||
text-decoration: none;
|
||||
color: #234;
|
||||
background: transparent;
|
||||
}
|
||||
#menu a:hover {
|
||||
background: rgb(203, 214, 228);
|
||||
color: #000;
|
||||
}
|
||||
#menu .current a, #menu .current a:hover, #menu .current a:visited, #menu .current a:active {
|
||||
background: rgb(223, 232, 241);
|
||||
padding-bottom: 3px;
|
||||
color: #000;
|
||||
border-right: 2px solid rgb(20, 86, 138);
|
||||
}
|
||||
.tip {
|
||||
color: rgb(68, 138, 189);
|
||||
padding: 1px 3px;
|
||||
}
|
||||
.inactive {
|
||||
color: #579;
|
||||
padding: 1px 3px;
|
||||
}
|
||||
.left {
|
||||
float: left;
|
||||
}
|
||||
.right {
|
||||
float: right;
|
||||
}
|
||||
.center {
|
||||
text-align: center;
|
||||
}
|
||||
#menu li.spacer {
|
||||
margin-left: 40px;
|
||||
}
|
||||
label {
|
||||
float: left;
|
||||
width: 18%;
|
||||
}
|
||||
#title, #descr {
|
||||
width: 80%;
|
||||
margin-top: 2px;
|
||||
}
|
||||
#descr {
|
||||
height: 35px;
|
||||
v-align: top;
|
||||
}
|
||||
#buttons {
|
||||
width: 98%;
|
||||
margin-top: 2px;
|
||||
text-align: right;
|
||||
}
|
||||
.popup {
|
||||
margin: 4px 4px;
|
||||
padding: 3px;
|
||||
position: absolute;
|
||||
width: 114px;
|
||||
height: 82px;
|
||||
display: none;
|
||||
background-color: rgb(223, 232, 241);
|
||||
opacity: .90;
|
||||
filter:alpha(opacity=90);
|
||||
text-align: center;
|
||||
}
|
||||
.popup a, .popup a:visited, .popup a:active {
|
||||
background-color: transparent;
|
||||
display: block;
|
||||
width: 100%;
|
||||
text-decoration: none;
|
||||
color: #246;
|
||||
}
|
||||
.popup a:hover {
|
||||
background-color: #fff;
|
||||
color: #000;
|
||||
}
|
||||
#flickrtags {
|
||||
display: inline;
|
||||
}
|
||||
#flickrtags input {
|
||||
border:0px;
|
||||
}
|
||||
input#flickrtag {
|
||||
background-color: white;
|
||||
color: black;
|
||||
width:65px;
|
||||
}
|
||||
input#flickrsubmit {
|
||||
background-color: #dfe8f1;
|
||||
color: black;
|
||||
}
|
||||
</style>
|
||||
</head>
|
||||
<body onload="init()">
|
||||
<ul id="menu">
|
||||
<li<?php echo $current_1; ?>><a href="image-uploading.php?action=upload&post=<?php echo $post; ?>&all=<?php echo $all; ?>">Upload Photo</a></li>
|
||||
<li<?php echo $current_flickr; ?>><a href="image-uploading.php?action=flickr&post=<?php echo $post; ?>">Browse Flickr</a></li>
|
||||
<li<?php echo $current_2; ?>><a href="image-uploading.php?action=view&post=<?php echo $post; ?>">Browse Attached</a></li>
|
||||
<li<?php echo $current_3; ?>><a href="image-uploading.php?action=view&post=<?php echo $post; ?>&all=true">Browse All</a></li>
|
||||
<li> </li>
|
||||
<?php if ( false !== $back ) : ?>
|
||||
<li class="spacer"><a href="image-uploading.php?action=<?php echo $action; ?>&post=<?php echo $post; ?>&all=<?php echo $all; ?>&start=0" title="First">|<</a></li>
|
||||
<li><a href="image-uploading.php?action=<?php echo $action; ?>&post=<?php echo $post; ?>&all=<?php echo $all; ?>&start=<?php echo $back; ?>" title="Back"><<</a></li>
|
||||
<?php else : ?>
|
||||
<li class="inactive spacer">|<</li>
|
||||
<li class="inactive"><<</li>
|
||||
<?php endif; ?>
|
||||
|
||||
<?php if($action == 'flickr') : ?>
|
||||
<form id="flickrtags" method="get"><?php echo sprintf(__('Tag: %s'), '<input type="text" id="flickrtag" name="flickrtag" value="' . $flickrtag . '" />'); ?><input id="flickrsubmit" type="submit" value="Filter" /><?php
|
||||
parse_str($_SERVER['QUERY_STRING'], $formquery);
|
||||
foreach($formquery as $k=>$v) if($k!='flickrtag') echo "<input type=\"hidden\" name=\"$k\" value=\"$v\" />";
|
||||
?></form>
|
||||
<?php endif; ?>
|
||||
|
||||
<?php if ( false !== $next ) : ?>
|
||||
<li><a href="image-uploading.php?action=<?php echo $action; ?>&post=<?php echo $post; ?>&all=<?php echo $all; ?>&start=<?php echo $next; ?>" title="Next">>></a></li>
|
||||
<li><a href="image-uploading.php?action=<?php echo $action; ?>&post=<?php echo $post; ?>&all=<?php echo $all; ?>&last=true" title="Last">>|</a></li>
|
||||
<?php else : ?>
|
||||
<li class="inactive">>></li>
|
||||
<li class="inactive">>|</li>
|
||||
<?php endif; ?>
|
||||
</ul>
|
||||
<?php if ( $action == 'view' || $action == 'flickr' ) : ?>
|
||||
<span class="left tip"><?php _e('Drag and drop photos to post'); ?></span>
|
||||
<span class="right tip"><?php _e('Click photos for more options'); ?></span>
|
||||
<div id="wrap">
|
||||
<div id="images">
|
||||
<?php echo $images_html; ?>
|
||||
</div>
|
||||
</div>
|
||||
<?php elseif ( $action == 'upload' ) : ?>
|
||||
<div class="center tip">Duplicated filenames will be numbered (photo.jpg, photo1.jpg, etc.)</div>
|
||||
<form enctype="multipart/form-data" id="uploadForm" method="POST" action="image-uploading.php" onsubmit="return validateImageName()">
|
||||
<label for="upload">Image:</label><input type="file" id="upload" name="image" onchange="validateImageName()" />
|
||||
<label for="title">Title:</label><input type="text" id="title" name="imgtitle" />
|
||||
<label for="descr">Description:</label><input type="textarea" name="descr" id="descr" value="" />
|
||||
<input type="hidden" name="action" value="save" />
|
||||
<input type="hidden" name="post" value="<?php echo $post; ?>" />
|
||||
<input type="hidden" name="all" value="<?php echo $all; ?>" />
|
||||
<div id="buttons">
|
||||
<input type="submit" value="Upload" />
|
||||
<input type="button" value="Cancel" onclick="cancelUpload()" />
|
||||
</div>
|
||||
</form>
|
||||
<?php endif; ?>
|
||||
</body>
|
||||
</html>
|
||||
|
||||
|
||||
|
||||
|
|
@ -33,9 +33,6 @@ $bookmarklet_height= 440;
|
|||
<p><label><?php _e('First name:') ?><br />
|
||||
<input type="text" name="first_name" value="<?php echo $profiledata->first_name ?>" /></label></p>
|
||||
|
||||
<p><label><?php _e('Middle name:') ?><br />
|
||||
<input type="text" name="middle_name" value="<?php echo $profiledata->middle_name ?>" /></label></p>
|
||||
|
||||
<p><label><?php _e('Last name:') ?><br />
|
||||
<input type="text" name="last_name" value="<?php echo $profiledata->last_name ?>" /></label></p>
|
||||
|
||||
|
|
@ -56,9 +53,6 @@ $bookmarklet_height= 440;
|
|||
<?php if ( !empty( $profiledata->first_name ) && !empty( $profiledata->last_name ) ) : ?>
|
||||
<option value="<?php echo $profiledata->first_name." ".$profiledata->last_name ?>"><?php echo $profiledata->first_name." ".$profiledata->last_name ?></option>
|
||||
<option value="<?php echo $profiledata->last_name." ".$profiledata->first_name ?>"><?php echo $profiledata->last_name." ".$profiledata->first_name ?></option>
|
||||
<?php if ( !empty( $profiledata->middle_name ) ) : ?>
|
||||
<option value="<?php echo $n = $profiledata->first_name." ".$profiledata->middle_name." ".$profiledata->last_name ?>"><?php echo $n ?></option>
|
||||
<?php endif; ?>
|
||||
<?php endif; ?>
|
||||
</select></label></p>
|
||||
</fieldset>
|
||||
|
|
@ -73,10 +67,6 @@ $bookmarklet_height= 440;
|
|||
<input type="text" name="url" value="<?php echo $profiledata->user_url ?>" />
|
||||
</label></p>
|
||||
|
||||
<p><label><?php _e('Flickr Username:') ?><br />
|
||||
<input type="text" name="flickr_username" value="<?php echo $profiledata->flickr_username ?>" />
|
||||
</label></p>
|
||||
|
||||
<p><label><?php _e('AIM:') ?><br />
|
||||
<input type="text" name="aim" value="<?php echo $profiledata->aim ?>" />
|
||||
</label></p>
|
||||
|
|
|
|||
|
|
@ -156,7 +156,7 @@ textarea, input, select {
|
|||
padding: 3px;
|
||||
}
|
||||
|
||||
#imageup {
|
||||
#uploading {
|
||||
border-style: none;
|
||||
padding: 0px;
|
||||
margin-bottom: 16px;
|
||||
|
|
|
|||
|
|
@ -53,15 +53,12 @@ function wp_insert_user($userdata) {
|
|||
clean_user_cache($user_login);
|
||||
|
||||
update_usermeta( $user_id, 'first_name', $first_name);
|
||||
update_usermeta( $user_id, 'middle_name', $middle_name);
|
||||
update_usermeta( $user_id, 'last_name', $last_name);
|
||||
update_usermeta( $user_id, 'nickname', $nickname );
|
||||
update_usermeta( $user_id, 'description', $description );
|
||||
update_usermeta( $user_id, 'jabber', $jabber );
|
||||
update_usermeta( $user_id, 'aim', $aim );
|
||||
update_usermeta( $user_id, 'yim', $yim );
|
||||
update_usermeta( $user_id, 'flickr_username', $flickr_username );
|
||||
|
||||
|
||||
if ( !$update ) {
|
||||
$user = new WP_User($user_id);
|
||||
|
|
@ -92,7 +89,7 @@ function wp_update_user($userdata) {
|
|||
$plaintext_pass = $userdata['user_pass'];
|
||||
$userdata['user_pass'] = md5($userdata['user_pass']);
|
||||
}
|
||||
|
||||
|
||||
// Merge old and new fields with new fields overwriting old ones.
|
||||
$userdata = array_merge($user, $userdata);
|
||||
$user_id = wp_insert_user($userdata);
|
||||
|
|
@ -125,4 +122,4 @@ function create_user( $username, $password, $email ) {
|
|||
}
|
||||
|
||||
|
||||
?>
|
||||
?>
|
||||
|
|
|
|||
Loading…
Reference in New Issue
Block a user