Navigation

← Previous Changeset
Next Changeset →

Changeset 617

Timestamp:

12/16/03 01:58:39 (5 years ago)

Author:

mikelittle

Message:

Some more b2->wp renaming

Files:

trunk/index.php (modified) (1 diff)
trunk/wp-admin/admin-header.php (modified) (1 diff)
trunk/wp-admin/bookmarklet.php (modified) (1 diff)
trunk/wp-admin/edit-showposts.php (modified) (1 diff)
trunk/wp-admin/import-b2.php (modified) (2 diffs)
trunk/wp-admin/import-blogger.php (modified) (2 diffs)
trunk/wp-admin/import-greymatter.php (modified) (2 diffs)
trunk/wp-admin/profile.php (modified) (3 diffs)
trunk/wp-admin/sidebar.php (modified) (1 diff)
trunk/wp-includes/functions.php (modified) (3 diffs)
trunk/wp-includes/template-functions.php (modified) (2 diffs)

Legend:

: Unmodified
: Added
: Removed
: Modified
: Copied
: Moved

trunk/index.php

r601	r617
94	94	<ul>
95	95	<li><a href="<?php echo $siteurl; ?>/wp-login.php">login</a></li>
96		<li><a href="<?php echo $siteurl; ?>/b2register.php">register</a></li>
	96	<li><a href="<?php echo $siteurl; ?>/wp-register.php">register</a></li>
97	97	</ul>
98	98	</li>

trunk/wp-admin/admin-header.php

r601	r617
77	77
78	78	function launchupload() {
79		window.open ("upload.php", "b2upload", "width=380,height=360,location=0,menubar=0,resizable=1,scrollbars=yes,status=1,toolbar=0");
	79	window.open ("upload.php", "wpupload", "width=380,height=360,location=0,menubar=0,resizable=1,scrollbars=yes,status=1,toolbar=0");
80	80	}
81	81

trunk/wp-admin/bookmarklet.php

r601	r617
39	39	<!--
40	40	function launchupload() {
41		window.open ("upload.php", "b2upload", "width=380,height=360,location=0,menubar=0,resizable=1,scrollbars=yes,status=1,toolbar=0");
	41	window.open ("upload.php", "wpupload", "width=380,height=360,location=0,menubar=0,resizable=1,scrollbars=yes,status=1,toolbar=0");
42	42	}
43	43

trunk/wp-admin/edit-showposts.php

r601	r617
285	285	if ( ('none' != get_settings("comment_moderation")) && ($user_level >= 3) ) {
286	286	if ('approved' == wp_get_comment_status($comment->comment_ID)) {
287		echo " - <a href=\"b2edit.php?action=unapprovecomment&p=".$post->ID."&comment=".$comment->comment_ID."\">Unapprove</a> ";
	287	echo " - <a href=\"edit.php?action=unapprovecomment&p=".$post->ID."&comment=".$comment->comment_ID."\">Unapprove</a> ";
288	288	} else {
289		echo " - <a href=\"b2edit.php?action=approvecomment&p=".$post->ID."&comment=".$comment->comment_ID."\">Approve</a> ";
	289	echo " - <a href=\"edit.php?action=approvecomment&p=".$post->ID."&comment=".$comment->comment_ID."\">Approve</a> ";
290	290	}
291	291	}

trunk/wp-admin/import-b2.php

r570	r617
60	60	</ul>
61	61	<p><code></code>Have you looked at the <a href="../readme.html">readme</a>? If
62		you’re all ready, <a href="~~b2-2-w~~p.php?step=1">let’s go</a>!</p>
	62	you’re all ready, <a href="import-b2.php.php?step=1">let’s go</a>!</p>
63	63	<?php
64	64	break;
…	…
189	189	?>
190	190	<p>Did you defeat the boss monster at the end? Good, then you’re ready for
191		<a href="~~b2-2-w~~p.php?step=2">Step 2</a>.</p>
	191	<a href="import-b2.php.php?step=2">Step 2</a>.</p>
192	192	<?php
193	193	break;

trunk/wp-admin/import-blogger.php

r601	r617
30	30	<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">
31	31	<title>Blogger to WordPress - Converting...</title>
32		<link rel="stylesheet" href="b2.css" type="text/css">
	32	<link rel="stylesheet" href="wp-admin.css" type="text/css">
33	33	</head>
34	34	<body>
…	…
180	180	<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">
181	181	<title>Blogger to WordPress Import Utility</title>
182		<link rel="stylesheet" href="b2.css" type="text/css">
	182	<link rel="stylesheet" href="wp-admin.css" type="text/css">
183	183	</head>
184	184

trunk/wp-admin/import-greymatter.php

r601	r617
64	64	</head>
65	65	<body style="margin: 20px;">
66		<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>
	66	<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>
67	67	<p>The importer is running...</p>
68	68	<ul>
…	…
275	275	</head>
276	276	<body style="margin: 20px;">
277		<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>
	277	<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>
278	278	<p>This is a basic GreyMatter to b2 import script.</p>
279	279	<p>What it does:</p>

trunk/wp-admin/profile.php

r601	r617
209	209	<p>To have a one-click bookmarklet, just copy and paste this<br />into a new text file:</p>
210	210	<?php
211		$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\"";
	211	$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\"";
212	212	?>
213	213	<pre style="margin: 20px; background-color: #cccccc; border: 1px dashed #333333; padding: 5px; font-size: 12px;"><?php echo $regedit; ?></pre>
…	…
330	330	} else if ($is_winIE) {
331	331	?>
332		<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
	332	<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
333	333	- <?php echo $blogname ?></a>
334	334	<script type="text/javascript" language="JavaScript">
…	…
346	346	} else if ($is_opera) {
347	347	?>
348		<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
	348	<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
349	349	- <?php echo $blogname ?></a>
350	350	<?php
351	351	} else if ($is_macIE) {
352	352	?>
353		<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
	353	<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
354	354	- <?php echo $blogname ?></a>
355	355	<?php

trunk/wp-admin/sidebar.php

r601	r617
47	47	<head>
48	48	<title>WordPress > sidebar</title>
49		<link rel="stylesheet" href="b2.css" type="text/css">
	49	<link rel="stylesheet" href="wp-admin.css" type="text/css">
50	50
51	51	<style type="text/css">

trunk/wp-includes/functions.php

r614	r617
821	821	// original function by Dries Buytaert for Drupal
822	822	global $use_weblogsping, $blogname,$siteurl,$blogfilename;
823		if ((!(($blogname=="my weblog") && ($siteurl=="http://example.com") && ($blogfilename=="b2.php"))) && (!preg_match("/localhost\//",$siteurl)) && ($use_weblogsping)) {
	823	if ((!(($blogname=="my weblog") && ($siteurl=="http://example.com") && ($blogfilename=="wp.php"))) && (!preg_match("/localhost\//",$siteurl)) && ($use_weblogsping)) {
824	824	$client = new xmlrpc_client("/RPC2", "rpc.weblogs.com", 80);
825	825	$message = new xmlrpcmsg("weblogUpdates.ping", array(new xmlrpcval($blogname), new xmlrpcval($siteurl."/".$blogfilename)));
…	…
853	853	function pingCafelog($cafelogID,$title='',$p='') {
854	854	global $use_cafelogping, $blogname, $siteurl, $blogfilename;
855		if ((!(($blogname=="my weblog") && ($siteurl=="http://example.com") && ($blogfilename=="b2.php"))) && (!preg_match("/localhost\//",$siteurl)) && ($use_cafelogping) && ($cafelogID != '')) {
	855	if ((!(($blogname=="my weblog") && ($siteurl=="http://example.com") && ($blogfilename=="wp.php"))) && (!preg_match("/localhost\//",$siteurl)) && ($use_cafelogping) && ($cafelogID != '')) {
856	856	$client = new xmlrpc_client("/xmlrpc.php", "cafelog.tidakada.com", 80);
857	857	$message = new xmlrpcmsg("b2.ping", array(new xmlrpcval($cafelogID), new xmlrpcval($title), new xmlrpcval($p)));
…	…
869	869	function pingBlogs($blog_ID="1") {
870	870	global $use_blodotgsping, $blodotgsping_url, $use_rss, $blogname, $siteurl, $blogfilename;
871		if ((!(($blogname=='my weblog') && ($siteurl=='http://example.com') && ($blogfilename=='b2.php'))) && (!preg_match('/localhost\//',$siteurl)) && ($use_blodotgsping)) {
	871	if ((!(($blogname=='my weblog') && ($siteurl=='http://example.com') && ($blogfilename=='wp.php'))) && (!preg_match('/localhost\//',$siteurl)) && ($use_blodotgsping)) {
872	872	$url = ($blodotgsping_url == 'http://example.com') ? $siteurl.'/'.$blogfilename : $blodotgsping_url;
873	873	$client = new xmlrpc_client('/', 'ping.blo.gs', 80);

trunk/wp-includes/template-functions.php

r610	r617
1463	1463	$b2commentspopupfile = $file;
1464	1464	$b2commentsjavascript = 1;
1465		$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";
	1465	$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";
1466	1466	echo $javascript;
1467	1467	}
…	…
1485	1485	echo $b2commentspopupfile.$querystring_start.'p'.$querystring_equal.$id.$querystring_separator.'c'.$querystring_equal.'1';
1486	1486	//echo get_permalink();
1487		echo '" onclick="b2open(this.href); return false"';
	1487	echo '" onclick="wpopen(this.href); return false"';
1488	1488	} else {
1489	1489	// if comments_popup_script() is not in the template, display simple comment link

Navigation

Changeset 617

Legend:

Download in other formats: