Some more b2->wp renaming

git-svn-id: http://svn.automattic.com/wordpress/trunk@617 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
mikelittle 2003-12-16 01:58:39 +00:00
parent 180b6e78bd
commit b0db88d03a
11 changed files with 21 additions and 21 deletions

View File

@ -93,7 +93,7 @@ require_once('wp-blog-header.php');
<li>Other: <li>Other:
<ul> <ul>
<li><a href="<?php echo $siteurl; ?>/wp-login.php">login</a></li> <li><a href="<?php echo $siteurl; ?>/wp-login.php">login</a></li>
<li><a href="<?php echo $siteurl; ?>/b2register.php">register</a></li> <li><a href="<?php echo $siteurl; ?>/wp-register.php">register</a></li>
</ul> </ul>
</li> </li>
<li>Meta: <li>Meta:

View File

@ -76,7 +76,7 @@ setTimeout("redirect();", 600);
} }
function launchupload() { function launchupload() {
window.open ("upload.php", "b2upload", "width=380,height=360,location=0,menubar=0,resizable=1,scrollbars=yes,status=1,toolbar=0"); window.open ("upload.php", "wpupload", "width=380,height=360,location=0,menubar=0,resizable=1,scrollbars=yes,status=1,toolbar=0");
} }
function helpWindow(url) { function helpWindow(url) {

View File

@ -38,7 +38,7 @@ window.close()
<script type="text/javascript" language="javascript"> <script type="text/javascript" language="javascript">
<!-- <!--
function launchupload() { function launchupload() {
window.open ("upload.php", "b2upload", "width=380,height=360,location=0,menubar=0,resizable=1,scrollbars=yes,status=1,toolbar=0"); window.open ("upload.php", "wpupload", "width=380,height=360,location=0,menubar=0,resizable=1,scrollbars=yes,status=1,toolbar=0");
} }
//--> //-->

View File

@ -284,9 +284,9 @@ echo $posts_nav_bar;
echo " - <a href=\"post.php?action=deletecomment&amp;p=".$post->ID."&amp;comment=".$comment->comment_ID."\" onclick=\"return confirm('You are about to delete this comment by \'".$comment->comment_author."\'\\n \'Cancel\' to stop, \'OK\' to delete.')\">Delete</a> "; echo " - <a href=\"post.php?action=deletecomment&amp;p=".$post->ID."&amp;comment=".$comment->comment_ID."\" onclick=\"return confirm('You are about to delete this comment by \'".$comment->comment_author."\'\\n \'Cancel\' to stop, \'OK\' to delete.')\">Delete</a> ";
if ( ('none' != get_settings("comment_moderation")) && ($user_level >= 3) ) { if ( ('none' != get_settings("comment_moderation")) && ($user_level >= 3) ) {
if ('approved' == wp_get_comment_status($comment->comment_ID)) { if ('approved' == wp_get_comment_status($comment->comment_ID)) {
echo " - <a href=\"b2edit.php?action=unapprovecomment&amp;p=".$post->ID."&amp;comment=".$comment->comment_ID."\">Unapprove</a> "; echo " - <a href=\"edit.php?action=unapprovecomment&amp;p=".$post->ID."&amp;comment=".$comment->comment_ID."\">Unapprove</a> ";
} else { } else {
echo " - <a href=\"b2edit.php?action=approvecomment&amp;p=".$post->ID."&amp;comment=".$comment->comment_ID."\">Approve</a> "; echo " - <a href=\"edit.php?action=approvecomment&amp;p=".$post->ID."&amp;comment=".$comment->comment_ID."\">Approve</a> ";
} }
} }
echo " ]"; echo " ]";

View File

@ -59,7 +59,7 @@ switch($step) {
Right now.</li> Right now.</li>
</ul> </ul>
<p><code></code>Have you looked at the <a href="../readme.html">readme</a>? If <p><code></code>Have you looked at the <a href="../readme.html">readme</a>? If
you&#8217;re all ready, <a href="b2-2-wp.php?step=1">let&#8217;s go</a>!</p> you&#8217;re all ready, <a href="import-b2.php.php?step=1">let&#8217;s go</a>!</p>
<?php <?php
break; break;
@ -188,7 +188,7 @@ if ($got_row) {
} }
?> ?>
<p>Did you defeat the boss monster at the end? Good, then you&#8217;re ready for <p>Did you defeat the boss monster at the end? Good, then you&#8217;re ready for
<a href="b2-2-wp.php?step=2">Step 2</a>.</p> <a href="import-b2.php.php?step=2">Step 2</a>.</p>
<?php <?php
break; break;
case 2: case 2:

View File

@ -29,7 +29,7 @@ case "step1":
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> <!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" xml:lang="en"> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">
<title>Blogger to WordPress - Converting...</title> <title>Blogger to WordPress - Converting...</title>
<link rel="stylesheet" href="b2.css" type="text/css"> <link rel="stylesheet" href="wp-admin.css" type="text/css">
</head> </head>
<body> <body>
<div class="wrap"> <div class="wrap">
@ -179,7 +179,7 @@ default:
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> <!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" xml:lang="en"> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">
<title>Blogger to WordPress Import Utility</title> <title>Blogger to WordPress Import Utility</title>
<link rel="stylesheet" href="b2.css" type="text/css"> <link rel="stylesheet" href="wp-admin.css" type="text/css">
</head> </head>
<body> <body>

View File

@ -63,7 +63,7 @@ textarea,input,select {
</style> </style>
</head> </head>
<body style="margin: 20px;"> <body style="margin: 20px;">
<p><font face="times new roman" style="font-size: 39px;">gm 2 <img src="wp-images/wpminilogo.png" width="50" height="50" border="0" alt="b2" align="top" /></font></p> <p><font face="times new roman" style="font-size: 39px;">gm 2 <img src="wp-images/wpminilogo.png" width="50" height="50" border="0" alt="WP" align="top" /></font></p>
<p>The importer is running...</p> <p>The importer is running...</p>
<ul> <ul>
<li>importing users... <ul><?php <li>importing users... <ul><?php
@ -274,7 +274,7 @@ textarea,input,select {
</style> </style>
</head> </head>
<body style="margin: 20px;"> <body style="margin: 20px;">
<p><font face="times new roman" style="font-size: 39px;">gm 2 <img src="wp-images/wpminilogo.png" width="50" height="50" border="0" alt="b2" align="top" /></font></p> <p><font face="times new roman" style="font-size: 39px;">gm 2 <img src="wp-images/wpminilogo.png" width="50" height="50" border="0" alt="WP" align="top" /></font></p>
<p>This is a basic GreyMatter to b2 import script.</p> <p>This is a basic GreyMatter to b2 import script.</p>
<p>What it does:</p> <p>What it does:</p>
<ul> <ul>

View File

@ -208,7 +208,7 @@ case 'IErightclick':
<p>To have a one-click bookmarklet, just copy and paste this<br />into a new text file:</p> <p>To have a one-click bookmarklet, just copy and paste this<br />into a new text file:</p>
<?php <?php
$regedit = "REGEDIT4\r\n[HKEY_CURRENT_USER\Software\Microsoft\Internet Explorer\MenuExt\Post To &WP : ".$blogname."]\r\n@=\"javascript:doc=external.menuArguments.document;Q=doc.selection.createRange().text;void(btw=window.open('".$siteurl."/wp-admin/bookmarklet.php?text='+escape(Q)+'".$bookmarklet_tbpb."&popupurl='+escape(doc.location.href)+'&popuptitle='+escape(doc.title),'b2bookmarklet','scrollbars=no,width=480,height=".$bookmarklet_height.",left=100,top=150,status=yes'));btw.focus();\"\r\n\"contexts\"=hex:31\""; $regedit = "REGEDIT4\r\n[HKEY_CURRENT_USER\Software\Microsoft\Internet Explorer\MenuExt\Post To &WP : ".$blogname."]\r\n@=\"javascript:doc=external.menuArguments.document;Q=doc.selection.createRange().text;void(btw=window.open('".$siteurl."/wp-admin/bookmarklet.php?text='+escape(Q)+'".$bookmarklet_tbpb."&popupurl='+escape(doc.location.href)+'&popuptitle='+escape(doc.title),'bookmarklet','scrollbars=no,width=480,height=".$bookmarklet_height.",left=100,top=150,status=yes'));btw.focus();\"\r\n\"contexts\"=hex:31\"";
?> ?>
<pre style="margin: 20px; background-color: #cccccc; border: 1px dashed #333333; padding: 5px; font-size: 12px;"><?php echo $regedit; ?></pre> <pre style="margin: 20px; background-color: #cccccc; border: 1px dashed #333333; padding: 5px; font-size: 12px;"><?php echo $regedit; ?></pre>
<p>Save it as wordpress.reg, and double-click on this file in an Explorer<br /> <p>Save it as wordpress.reg, and double-click on this file in an Explorer<br />
@ -329,7 +329,7 @@ if ($is_NS4 || $is_gecko) {
<?php <?php
} else if ($is_winIE) { } else if ($is_winIE) {
?> ?>
<a href="javascript:Q='';if(top.frames.length==0)Q=document.selection.createRange().text;void(btw=window.open('<?php echo $siteurl ?>/wp-admin/bookmarklet.php?text='+escape(Q)+'<?php echo $bookmarklet_tbpb ?>&popupurl='+escape(location.href)+'&popuptitle='+escape(document.title),'b2bookmarklet','scrollbars=no,width=480,height=<?php echo $bookmarklet_height ?>,left=100,top=150,status=yes'));btw.focus();">WordPress <a href="javascript:Q='';if(top.frames.length==0)Q=document.selection.createRange().text;void(btw=window.open('<?php echo $siteurl ?>/wp-admin/bookmarklet.php?text='+escape(Q)+'<?php echo $bookmarklet_tbpb ?>&popupurl='+escape(location.href)+'&popuptitle='+escape(document.title),'bookmarklet','scrollbars=no,width=480,height=<?php echo $bookmarklet_height ?>,left=100,top=150,status=yes'));btw.focus();">WordPress
- <?php echo $blogname ?></a> - <?php echo $blogname ?></a>
<script type="text/javascript" language="JavaScript"> <script type="text/javascript" language="JavaScript">
<!-- <!--
@ -345,12 +345,12 @@ function oneclickbookmarklet(blah) {
<?php <?php
} else if ($is_opera) { } else if ($is_opera) {
?> ?>
<a href="javascript:void(window.open('<?php echo $siteurl ?>/wp-admin/bookmarklet.php?popupurl='+escape(location.href)+'&popuptitle='+escape(document.title)+'<?php echo $bookmarklet_tbpb ?>','b2bookmarklet','scrollbars=no,width=480,height=<?php echo $bookmarklet_height ?>,left=100,top=150,status=yes'));">WordPress <a href="javascript:void(window.open('<?php echo $siteurl ?>/wp-admin/bookmarklet.php?popupurl='+escape(location.href)+'&popuptitle='+escape(document.title)+'<?php echo $bookmarklet_tbpb ?>','bookmarklet','scrollbars=no,width=480,height=<?php echo $bookmarklet_height ?>,left=100,top=150,status=yes'));">WordPress
- <?php echo $blogname ?></a> - <?php echo $blogname ?></a>
<?php <?php
} else if ($is_macIE) { } else if ($is_macIE) {
?> ?>
<a href="javascript:Q='';if(top.frames.length==0);void(btw=window.open('<?php echo $siteurl ?>/wp-admin/bookmarklet.php?text='+escape(document.getSelection())+'&popupurl='+escape(location.href)+'&popuptitle='+escape(document.title)+'<?php echo $bookmarklet_tbpb ?>','b2bookmarklet','scrollbars=no,width=480,height=<?php echo $bookmarklet_height ?>,left=100,top=150,status=yes'));btw.focus();">WordPress <a href="javascript:Q='';if(top.frames.length==0);void(btw=window.open('<?php echo $siteurl ?>/wp-admin/bookmarklet.php?text='+escape(document.getSelection())+'&popupurl='+escape(location.href)+'&popuptitle='+escape(document.title)+'<?php echo $bookmarklet_tbpb ?>','bookmarklet','scrollbars=no,width=480,height=<?php echo $bookmarklet_height ?>,left=100,top=150,status=yes'));btw.focus();">WordPress
- <?php echo $blogname ?></a> - <?php echo $blogname ?></a>
<?php <?php
} }

View File

@ -46,7 +46,7 @@ if ($a=="b") {
?><html> ?><html>
<head> <head>
<title>WordPress > sidebar</title> <title>WordPress > sidebar</title>
<link rel="stylesheet" href="b2.css" type="text/css"> <link rel="stylesheet" href="wp-admin.css" type="text/css">
<style type="text/css"> <style type="text/css">
<!-- <!--

View File

@ -820,7 +820,7 @@ function timer_stop($display=0,$precision=3) { //if called like timer_stop(1), w
function pingWeblogs($blog_ID = 1) { function pingWeblogs($blog_ID = 1) {
// original function by Dries Buytaert for Drupal // original function by Dries Buytaert for Drupal
global $use_weblogsping, $blogname,$siteurl,$blogfilename; global $use_weblogsping, $blogname,$siteurl,$blogfilename;
if ((!(($blogname=="my weblog") && ($siteurl=="http://example.com") && ($blogfilename=="b2.php"))) && (!preg_match("/localhost\//",$siteurl)) && ($use_weblogsping)) { if ((!(($blogname=="my weblog") && ($siteurl=="http://example.com") && ($blogfilename=="wp.php"))) && (!preg_match("/localhost\//",$siteurl)) && ($use_weblogsping)) {
$client = new xmlrpc_client("/RPC2", "rpc.weblogs.com", 80); $client = new xmlrpc_client("/RPC2", "rpc.weblogs.com", 80);
$message = new xmlrpcmsg("weblogUpdates.ping", array(new xmlrpcval($blogname), new xmlrpcval($siteurl."/".$blogfilename))); $message = new xmlrpcmsg("weblogUpdates.ping", array(new xmlrpcval($blogname), new xmlrpcval($siteurl."/".$blogfilename)));
$result = $client->send($message); $result = $client->send($message);
@ -852,7 +852,7 @@ function pingWeblogsRss($blog_ID = 1, $rss_url) {
// pings CaféLog.com // pings CaféLog.com
function pingCafelog($cafelogID,$title='',$p='') { function pingCafelog($cafelogID,$title='',$p='') {
global $use_cafelogping, $blogname, $siteurl, $blogfilename; global $use_cafelogping, $blogname, $siteurl, $blogfilename;
if ((!(($blogname=="my weblog") && ($siteurl=="http://example.com") && ($blogfilename=="b2.php"))) && (!preg_match("/localhost\//",$siteurl)) && ($use_cafelogping) && ($cafelogID != '')) { if ((!(($blogname=="my weblog") && ($siteurl=="http://example.com") && ($blogfilename=="wp.php"))) && (!preg_match("/localhost\//",$siteurl)) && ($use_cafelogping) && ($cafelogID != '')) {
$client = new xmlrpc_client("/xmlrpc.php", "cafelog.tidakada.com", 80); $client = new xmlrpc_client("/xmlrpc.php", "cafelog.tidakada.com", 80);
$message = new xmlrpcmsg("b2.ping", array(new xmlrpcval($cafelogID), new xmlrpcval($title), new xmlrpcval($p))); $message = new xmlrpcmsg("b2.ping", array(new xmlrpcval($cafelogID), new xmlrpcval($title), new xmlrpcval($p)));
$result = $client->send($message); $result = $client->send($message);
@ -868,7 +868,7 @@ function pingCafelog($cafelogID,$title='',$p='') {
// pings Blo.gs // pings Blo.gs
function pingBlogs($blog_ID="1") { function pingBlogs($blog_ID="1") {
global $use_blodotgsping, $blodotgsping_url, $use_rss, $blogname, $siteurl, $blogfilename; global $use_blodotgsping, $blodotgsping_url, $use_rss, $blogname, $siteurl, $blogfilename;
if ((!(($blogname=='my weblog') && ($siteurl=='http://example.com') && ($blogfilename=='b2.php'))) && (!preg_match('/localhost\//',$siteurl)) && ($use_blodotgsping)) { if ((!(($blogname=='my weblog') && ($siteurl=='http://example.com') && ($blogfilename=='wp.php'))) && (!preg_match('/localhost\//',$siteurl)) && ($use_blodotgsping)) {
$url = ($blodotgsping_url == 'http://example.com') ? $siteurl.'/'.$blogfilename : $blodotgsping_url; $url = ($blodotgsping_url == 'http://example.com') ? $siteurl.'/'.$blogfilename : $blodotgsping_url;
$client = new xmlrpc_client('/', 'ping.blo.gs', 80); $client = new xmlrpc_client('/', 'ping.blo.gs', 80);
if ($use_rss) { if ($use_rss) {

View File

@ -1462,7 +1462,7 @@ function comments_popup_script($width=400, $height=400, $file='wp-comments-popup
global $b2commentspopupfile, $b2trackbackpopupfile, $b2pingbackpopupfile, $b2commentsjavascript; global $b2commentspopupfile, $b2trackbackpopupfile, $b2pingbackpopupfile, $b2commentsjavascript;
$b2commentspopupfile = $file; $b2commentspopupfile = $file;
$b2commentsjavascript = 1; $b2commentsjavascript = 1;
$javascript = "<script type='text/javascript'>\nfunction b2open (macagna) {\n window.open(macagna, '_blank', 'width=$width,height=$height,scrollbars=yes,status=yes');\n}\n</script>\n"; $javascript = "<script type='text/javascript'>\nfunction wpopen (macagna) {\n window.open(macagna, '_blank', 'width=$width,height=$height,scrollbars=yes,status=yes');\n}\n</script>\n";
echo $javascript; echo $javascript;
} }
@ -1484,7 +1484,7 @@ function comments_popup_link($zero='No Comments', $one='1 Comment', $more='% Com
if ($b2commentsjavascript) { if ($b2commentsjavascript) {
echo $b2commentspopupfile.$querystring_start.'p'.$querystring_equal.$id.$querystring_separator.'c'.$querystring_equal.'1'; echo $b2commentspopupfile.$querystring_start.'p'.$querystring_equal.$id.$querystring_separator.'c'.$querystring_equal.'1';
//echo get_permalink(); //echo get_permalink();
echo '" onclick="b2open(this.href); return false"'; echo '" onclick="wpopen(this.href); return false"';
} else { } else {
// if comments_popup_script() is not in the template, display simple comment link // if comments_popup_script() is not in the template, display simple comment link
comments_link(); comments_link();