Remove use of deprecated variables, don't show bookmarklet form to unrecognized browser.
git-svn-id: https://develop.svn.wordpress.org/trunk@3685 602fd350-edb4-49c9-b593-d223f7449a82
This commit is contained in:
parent
07a12ad2b1
commit
d17b992895
|
@ -1,90 +1,94 @@
|
||||||
<?php
|
<?php
|
||||||
require_once('admin.php');
|
require_once('admin.php');
|
||||||
$title = __('Create New Post');
|
$title = __('Create New Post');
|
||||||
$parent_file = 'post-new.php';
|
$parent_file = 'post-new.php';
|
||||||
$editing = true;
|
$editing = true;
|
||||||
require_once ('./admin-header.php');
|
require_once ('./admin-header.php');
|
||||||
|
|
||||||
if ( ! current_user_can('edit_posts') ) { ?>
|
if ( ! current_user_can('edit_posts') ) { ?>
|
||||||
<div class="wrap">
|
<div class="wrap">
|
||||||
<p><?php printf(__('Since you’re a newcomer, you’ll have to wait for an admin to raise your level to 1, in order to be authorized to post.<br />
|
<p><?php printf(__('Since you’re a newcomer, you’ll have to wait for an admin to raise your level to 1, in order to be authorized to post.<br />
|
||||||
You can also <a href="mailto:%s?subject=Promotion?">e-mail the admin</a> to ask for a promotion.<br />
|
You can also <a href="mailto:%s?subject=Promotion?">e-mail the admin</a> to ask for a promotion.<br />
|
||||||
When you’re promoted, just reload this page and you’ll be able to blog. :)'), get_settings('admin_email')); ?>
|
When you’re promoted, just reload this page and you’ll be able to blog. :)'), get_settings('admin_email')); ?>
|
||||||
</p>
|
</p>
|
||||||
</div>
|
</div>
|
||||||
<?php
|
<?php
|
||||||
include('admin-footer.php');
|
include('admin-footer.php');
|
||||||
exit();
|
exit();
|
||||||
}
|
}
|
||||||
|
|
||||||
if ( isset($_GET['posted']) ) : ?>
|
if ( isset($_GET['posted']) ) : ?>
|
||||||
<div id="message" class="updated fade"><p><?php printf(__('Post saved. <a href="%s">View site »</a>'), get_bloginfo('home') . '/'); ?></p></div>
|
<div id="message" class="updated fade"><p><?php printf(__('Post saved. <a href="%s">View site »</a>'), get_bloginfo('home') . '/'); ?></p></div>
|
||||||
<?php
|
<?php
|
||||||
endif;
|
endif;
|
||||||
|
|
||||||
if ( $drafts = get_users_drafts( $user_ID ) ) { ?>
|
if ( $drafts = get_users_drafts( $user_ID ) ) { ?>
|
||||||
<div class="wrap">
|
<div class="wrap">
|
||||||
<p><strong><?php _e('Your Drafts:') ?></strong>
|
<p><strong><?php _e('Your Drafts:') ?></strong>
|
||||||
<?php
|
<?php
|
||||||
// Show drafts.
|
// Show drafts.
|
||||||
$num_drafts = count($drafts);
|
$num_drafts = count($drafts);
|
||||||
if ( $num_drafts > 15 ) $num_drafts = 15;
|
if ( $num_drafts > 15 ) $num_drafts = 15;
|
||||||
for ( $i = 0; $i < $num_drafts; $i++ ) {
|
for ( $i = 0; $i < $num_drafts; $i++ ) {
|
||||||
$draft = $drafts[$i];
|
$draft = $drafts[$i];
|
||||||
if ( 0 != $i )
|
if ( 0 != $i )
|
||||||
echo ', ';
|
echo ', ';
|
||||||
if ( empty($draft->post_title) )
|
if ( empty($draft->post_title) )
|
||||||
$draft->post_title = sprintf(__('Post # %s'), $draft->ID);
|
$draft->post_title = sprintf(__('Post # %s'), $draft->ID);
|
||||||
echo "<a href='post.php?action=edit&post=$draft->ID' title='" . __('Edit this draft') . "'>$draft->post_title</a>";
|
echo "<a href='post.php?action=edit&post=$draft->ID' title='" . __('Edit this draft') . "'>$draft->post_title</a>";
|
||||||
}
|
}
|
||||||
|
|
||||||
if ( 15 < count($drafts) ) { ?>
|
if ( 15 < count($drafts) ) { ?>
|
||||||
, <a href="edit.php"><?php echo sprintf(__('and %s more'), (count($drafts) - 15) ); ?> »</a>
|
, <a href="edit.php"><?php echo sprintf(__('and %s more'), (count($drafts) - 15) ); ?> »</a>
|
||||||
<?php } ?>
|
<?php } ?>
|
||||||
.</p>
|
.</p>
|
||||||
</div>
|
</div>
|
||||||
<?php
|
<?php
|
||||||
}
|
}
|
||||||
|
|
||||||
// Show post form.
|
// Show post form.
|
||||||
$post = get_default_post_to_edit();
|
$post = get_default_post_to_edit();
|
||||||
include('edit-form-advanced.php');
|
include('edit-form-advanced.php');
|
||||||
?>
|
?>
|
||||||
<div class="wrap">
|
|
||||||
<h3><?php _e('WordPress bookmarklet'); ?></h3>
|
<?php if ( $is_NS4 || $is_gecko || $is_winIE ) { ?>
|
||||||
<p><?php _e('Right click on the following link and choose "Add to favorites" to create a posting shortcut.'); ?></p>
|
<div class="wrap">
|
||||||
<p>
|
<h3><?php _e('WordPress bookmarklet'); ?></h3>
|
||||||
|
<p><?php _e('Right click on the following link and choose "Add to favorites" to create a posting shortcut.'); ?></p>
|
||||||
<?php
|
<p>
|
||||||
if ($is_NS4 || $is_gecko) {
|
|
||||||
?>
|
<?php
|
||||||
<a href="javascript:if(navigator.userAgent.indexOf('Safari') >= 0){Q=getSelection();}else{Q=document.selection?document.selection.createRange().text:document.getSelection();}location.href='<?php echo get_settings('siteurl') ?>/wp-admin/post-new.php?text='+encodeURIComponent(Q)+'&popupurl='+encodeURIComponent(location.href)+'&popuptitle='+encodeURIComponent(document.title);"><?php printf(__('Press It - %s'), wp_specialchars(get_settings('blogname'))); ?></a>
|
if ($is_NS4 || $is_gecko) {
|
||||||
<?php
|
?>
|
||||||
} else if ($is_winIE) {
|
<a href="javascript:if(navigator.userAgent.indexOf('Safari') >= 0){Q=getSelection();}else{Q=document.selection?document.selection.createRange().text:document.getSelection();}location.href='<?php echo get_settings('siteurl') ?>/wp-admin/post-new.php?text='+encodeURIComponent(Q)+'&popupurl='+encodeURIComponent(location.href)+'&popuptitle='+encodeURIComponent(document.title);"><?php printf(__('Press It - %s'), wp_specialchars(get_settings('blogname'))); ?></a>
|
||||||
?>
|
<?php
|
||||||
<a href="javascript:Q='';if(top.frames.length==0)Q=document.selection.createRange().text;location.href='<?php echo get_settings('siteurl') ?>/wp-admin/post-new.php?text='+encodeURIComponent(Q)+'&popupurl='+encodeURIComponent(location.href)+'&popuptitle='+encodeURIComponent(document.title);"><?php printf(__('Press it - %s'), get_settings('blogname')); ?></a>
|
} else if ($is_winIE) {
|
||||||
<script type="text/javascript">
|
?>
|
||||||
<!--
|
<a href="javascript:Q='';if(top.frames.length==0)Q=document.selection.createRange().text;location.href='<?php echo get_settings('siteurl') ?>/wp-admin/post-new.php?text='+encodeURIComponent(Q)+'&popupurl='+encodeURIComponent(location.href)+'&popuptitle='+encodeURIComponent(document.title);"><?php printf(__('Press it - %s'), get_settings('blogname')); ?></a>
|
||||||
function oneclickbookmarklet(blah) {
|
<script type="text/javascript">
|
||||||
window.open ("profile.php?action=IErightclick", "oneclickbookmarklet", "width=500, height=450, location=0, menubar=0, resizable=0, scrollbars=1, status=1, titlebar=0, toolbar=0, screenX=120, left=120, screenY=120, top=120");
|
<!--
|
||||||
}
|
function oneclickbookmarklet(blah) {
|
||||||
// -->
|
window.open ("profile.php?action=IErightclick", "oneclickbookmarklet", "width=500, height=450, location=0, menubar=0, resizable=0, scrollbars=1, status=1, titlebar=0, toolbar=0, screenX=120, left=120, screenY=120, top=120");
|
||||||
</script>
|
}
|
||||||
<br />
|
// -->
|
||||||
<br />
|
</script>
|
||||||
<?php _e('One-click bookmarklet:') ?><br />
|
<br />
|
||||||
<a href="javascript:oneclickbookmarklet(0);"><?php _e('click here') ?></a>
|
<br />
|
||||||
<?php
|
<?php _e('One-click bookmarklet:') ?><br />
|
||||||
} else if ($is_opera) {
|
<a href="javascript:oneclickbookmarklet(0);"><?php _e('click here') ?></a>
|
||||||
?>
|
<?php
|
||||||
<a href="javascript:location.href='<?php echo get_settings('siteurl'); ?>/wp-admin/post-new.php?popupurl='+escape(location.href)+'&popuptitle='+escape(document.title);"><?php printf(__('Press it - %s'), get_settings('blogname')); ?></a>
|
} else if ($is_opera) {
|
||||||
<?php
|
?>
|
||||||
} else if ($is_macIE) {
|
<a href="javascript:location.href='<?php echo get_settings('siteurl'); ?>/wp-admin/post-new.php?popupurl='+escape(location.href)+'&popuptitle='+escape(document.title);"><?php printf(__('Press it - %s'), get_settings('blogname')); ?></a>
|
||||||
?>
|
<?php
|
||||||
<a href="javascript:Q='';location.href='<?php echo get_settings('siteurl'); ?>/wp-admin/bookmarklet.php?text='+escape(document.getSelection())+'&popupurl='+escape(location.href)+'&popuptitle='+escape(document.title);"><?php printf(__('Press it - %s'), get_settings('blogname')); ?></a>
|
} else if ($is_macIE) {
|
||||||
<?php
|
?>
|
||||||
}
|
<a href="javascript:Q='';location.href='<?php echo get_settings('siteurl'); ?>/wp-admin/bookmarklet.php?text='+escape(document.getSelection())+'&popupurl='+escape(location.href)+'&popuptitle='+escape(document.title);"><?php printf(__('Press it - %s'), get_settings('blogname')); ?></a>
|
||||||
?>
|
<?php
|
||||||
</p>
|
}
|
||||||
</div>
|
?>
|
||||||
<?php include('admin-footer.php'); ?>
|
</p>
|
||||||
|
</div>
|
||||||
|
<?php } ?>
|
||||||
|
|
||||||
|
<?php include('admin-footer.php'); ?>
|
|
@ -14,20 +14,18 @@ if (preg_match('#([^/]+.php)#', $PHP_SELF, $self_matches)) {
|
||||||
|
|
||||||
// Simple browser detection
|
// Simple browser detection
|
||||||
$is_lynx = 0; $is_gecko = 0; $is_winIE = 0; $is_macIE = 0; $is_opera = 0; $is_NS4 = 0;
|
$is_lynx = 0; $is_gecko = 0; $is_winIE = 0; $is_macIE = 0; $is_opera = 0; $is_NS4 = 0;
|
||||||
if (!isset($HTTP_USER_AGENT)) {
|
|
||||||
$HTTP_USER_AGENT = $_SERVER['HTTP_USER_AGENT'];
|
if (preg_match('/Lynx/', $_SERVER['HTTP_USER_AGENT'])) {
|
||||||
}
|
|
||||||
if (preg_match('/Lynx/', $HTTP_USER_AGENT)) {
|
|
||||||
$is_lynx = 1;
|
$is_lynx = 1;
|
||||||
} elseif (preg_match('/Gecko/', $HTTP_USER_AGENT)) {
|
} elseif (preg_match('/Gecko/', $_SERVER['HTTP_USER_AGENT'])) {
|
||||||
$is_gecko = 1;
|
$is_gecko = 1;
|
||||||
} elseif ((preg_match('/MSIE/', $HTTP_USER_AGENT)) && (preg_match('/Win/', $HTTP_USER_AGENT))) {
|
} elseif ((preg_match('/MSIE/', $_SERVER['HTTP_USER_AGENT'])) && (preg_match('/Win/', $_SERVER['HTTP_USER_AGENT']))) {
|
||||||
$is_winIE = 1;
|
$is_winIE = 1;
|
||||||
} elseif ((preg_match('/MSIE/', $HTTP_USER_AGENT)) && (preg_match('/Mac/', $HTTP_USER_AGENT))) {
|
} elseif ((preg_match('/MSIE/', $_SERVER['HTTP_USER_AGENT'])) && (preg_match('/Mac/', $_SERVER['HTTP_USER_AGENT']))) {
|
||||||
$is_macIE = 1;
|
$is_macIE = 1;
|
||||||
} elseif (preg_match('/Opera/', $HTTP_USER_AGENT)) {
|
} elseif (preg_match('/Opera/', $_SERVER['HTTP_USER_AGENT'])) {
|
||||||
$is_opera = 1;
|
$is_opera = 1;
|
||||||
} elseif ((preg_match('/Nav/', $HTTP_USER_AGENT) ) || (preg_match('/Mozilla\/4\./', $HTTP_USER_AGENT))) {
|
} elseif ((preg_match('/Nav/', $_SERVER['HTTP_USER_AGENT']) ) || (preg_match('/Mozilla\/4\./', $_SERVER['HTTP_USER_AGENT']))) {
|
||||||
$is_NS4 = 1;
|
$is_NS4 = 1;
|
||||||
}
|
}
|
||||||
$is_IE = (($is_macIE) || ($is_winIE));
|
$is_IE = (($is_macIE) || ($is_winIE));
|
||||||
|
|
|
@ -18,7 +18,6 @@ function unregister_GLOBALS() {
|
||||||
|
|
||||||
unregister_GLOBALS();
|
unregister_GLOBALS();
|
||||||
|
|
||||||
$HTTP_USER_AGENT = getenv('HTTP_USER_AGENT');
|
|
||||||
unset( $wp_filter, $cache_userdata, $cache_lastcommentmodified, $cache_lastpostdate, $cache_settings, $category_cache, $cache_categories );
|
unset( $wp_filter, $cache_userdata, $cache_lastcommentmodified, $cache_lastpostdate, $cache_settings, $category_cache, $cache_categories );
|
||||||
|
|
||||||
if ( ! isset($blog_id) )
|
if ( ! isset($blog_id) )
|
||||||
|
|
Loading…
Reference in New Issue