golem
/
twentyGOLEM
9
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Removed $pathserver. Now use $siteurl everywhere. 

git-svn-id: http://svn.automattic.com/wordpress/trunk@83 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
mikelittle 2003-05-24 21:50:22 +00:00
parent edc41fdbd8
commit debf2f7147
7 changed files with 19 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
b2-include/b2template.functions.php
View File

@ -40,7 +40,7 @@ function bloginfo_unicode($show='') {
} }
function get_bloginfo($show='') { function get_bloginfo($show='') {
global $siteurl, $blogfilename, $blogname, $blogdescription, $pathserver, $admin_email; global $siteurl, $blogfilename, $blogname, $blogdescription, $siteurl, $admin_email;
switch($show) { switch($show) {
case "url": case "url":
$output = $siteurl."/".$blogfilename; $output = $siteurl."/".$blogfilename;
@ -58,7 +58,7 @@ function get_bloginfo($show='') {
$output = $siteurl.'/b2rss2.php'; $output = $siteurl.'/b2rss2.php';
break; break;
case "pingback_url": case "pingback_url":
$output = $pathserver.'/xmlrpc.php'; $output = $siteurl.'/xmlrpc.php';
break; break;
case "admin_email": case "admin_email":
$output = $admin_email; $output = $admin_email;
@ -1083,8 +1083,8 @@ function comment_time($d='') {
/***** TrackBack tags *****/ /***** TrackBack tags *****/
function trackback_url($display = 1) { function trackback_url($display = 1) {
global $pathserver, $id; global $siteurl, $id;
$tb_url = $pathserver.'/b2trackback.php/'.$id; $tb_url = $siteurl.'/b2trackback.php/'.$id;
if ($display) { if ($display) {
echo $tb_url; echo $tb_url;
} else { } else {
@ -1136,7 +1136,7 @@ function trackback_popup_link($zero='no trackback', $one='1 trackback', $more='%
} }
function trackback_rdf($timezone=0) { function trackback_rdf($timezone=0) {
global $pathserver, $id, $HTTP_SERVER_VARS; global $siteurl, $id, $HTTP_SERVER_VARS;
if (!stristr($HTTP_SERVER_VARS['HTTP_USER_AGENT'], 'W3C_Validator')) { if (!stristr($HTTP_SERVER_VARS['HTTP_USER_AGENT'], 'W3C_Validator')) {
echo '<rdf:RDF xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" '."\n"; echo '<rdf:RDF xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" '."\n";
echo ' xmlns:dc="http://purl.org/dc/elements/1.1/"'."\n"; echo ' xmlns:dc="http://purl.org/dc/elements/1.1/"'."\n";

14
b2config.php
View File

@ -18,14 +18,6 @@ $blogfilename = 'index.php';
$blogname = "my weblog"; $blogname = "my weblog";
$blogdescription = "babblings !"; $blogdescription = "babblings !";
// $pathserver is where you have uploaded b2: for example, 'http://mydomain.com' (no ending slash !)
// by default b2 is set to run in the folder your blog resides, same as $siteurl
$pathserver = 'http://example.com';
// your email (obvious eh ?) // your email (obvious eh ?)
$admin_email = 'you@example.com'; $admin_email = 'you@example.com';
@ -42,7 +34,6 @@ $users_can_register = 1;
$start_of_week = 1; $start_of_week = 1;
// ** MySQL settings ** // ** MySQL settings **
// fill with your database details // fill with your database details
@ -335,7 +326,7 @@ $HTTP_USER_AGENT=getenv('HTTP_USER_AGENT'); /* visitor's browser */
$server = $dbhost; $server = $dbhost;
$loginsql = $dbusername; $loginsql = $dbusername;
$passsql = $dbpassword; $passsql = $dbpassword;
$path = $pathserver; $path = $siteurl;
$base = $dbname; $base = $dbname;
// This is so the new admin location works // This is so the new admin location works
@ -343,5 +334,4 @@ $base = $dbname;
//$path_sep=';'; //$path_sep=';';
$path_sep=':'; $path_sep=':';
ini_set('include_path', ".$path_sep..$path_sep../$b2inc$path_sep./$b2inc"); ini_set('include_path', ".$path_sep..$path_sep../$b2inc$path_sep./$b2inc");
?>
?>

10
b2login.php
View File

@ -175,7 +175,7 @@ case "lostpassword":
<head> <head>
<title>WordPress > Lost password ?</title> <title>WordPress > Lost password ?</title>
<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" /> <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" />
<link rel="stylesheet" href="<?php echo $pathserver; ?>/wp-admin/b2.css" type="text/css" /> <link rel="stylesheet" href="<?php echo $siteurl; ?>/wp-admin/b2.css" type="text/css" />
<style type="text/css"> <style type="text/css">
<!-- <!--
<?php <?php
@ -287,7 +287,7 @@ default:
<head> <head>
<title>WordPress > Login form</title> <title>WordPress > Login form</title>
<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1"> <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
<link rel="stylesheet" href="<?php echo $pathserver; ?>/wp-admin/b2.css" type="text/css"> <link rel="stylesheet" href="<?php echo $siteurl; ?>/wp-admin/b2.css" type="text/css">
<style type="text/css"> <style type="text/css">
<!-- <!--
<?php <?php
@ -313,11 +313,11 @@ textarea, input, select {
<td align="center" valign="middle"> <td align="center" valign="middle">
<div id="login"> <div id="login">
<p><a href="<?=$pathserver?>">Back to blog?</a><br /> <p><a href="<?=$siteurl?>">Back to blog?</a><br />
<?php if ($users_can_register) { ?> <?php if ($users_can_register) { ?>
<a href="<?php echo $pathserver; ?>/b2register.php">Register?</a><br /> <a href="<?php echo $siteurl; ?>/b2register.php">Register?</a><br />
<?php } ?> <?php } ?>
<a href="<?php echo $pathserver; ?>/b2login.php?action=lostpassword">Lost your password?</a></p> <a href="<?php echo $siteurl; ?>/b2login.php?action=lostpassword">Lost your password?</a></p>
<?php <?php
if ($error) echo "<div align=\"right\" style=\"padding:4px;\"><font color=\"#FF0000\">$error</font><br />&nbsp;</div>"; if ($error) echo "<div align=\"right\" style=\"padding:4px;\"><font color=\"#FF0000\">$error</font><br />&nbsp;</div>";

2
blog.header.php
View File

@ -35,7 +35,7 @@ $b2varstoreset = array('m','p','posts','w','c', 'cat','withcomments','s','search
/* Connecting to the db */ /* Connecting to the db */
dbconnect(); dbconnect();
@header ("X-Pingback: $pathserver/xmlrpc.php"); @header ("X-Pingback: $siteurl/xmlrpc.php");
/* Sending HTTP headers /* Sending HTTP headers
// It is presumptious to think that WP is the only thing that might change on the page. // It is presumptious to think that WP is the only thing that might change on the page.
$last_modified_header = mysql2date('D, d M Y H:i:s', get_lastpostdate()); $last_modified_header = mysql2date('D, d M Y H:i:s', get_lastpostdate());

2
wp-admin/b2menutop.php
View File

@ -23,7 +23,7 @@ while ($j != "") {
} }
?> ?>
<li><a href="<?php echo $pathserver."/".$blogfilename; ?>">View site</a></li> <li><a href="<?php echo $siteurl."/".$blogfilename; ?>">View site</a></li>
<li id="last"><a href="<?php echo $siteurl ?>/b2login.php?action=logout">Logout</a></li> <li id="last"><a href="<?php echo $siteurl ?>/b2login.php?action=logout">Logout</a></li>
</ul> </ul>
<br clear="all" /> <br clear="all" />

6
wp-admin/b2profile.php
View File

@ -258,7 +258,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('".$pathserver."/wp-admin/b2bookmarklet.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/b2bookmarklet.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\"";
?> ?>
<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 />
@ -435,7 +435,7 @@ One-click bookmarklet:<br />
function addPanel() function addPanel()
{ {
if ((typeof window.sidebar == "object") && (typeof window.sidebar.addPanel == "function")) if ((typeof window.sidebar == "object") && (typeof window.sidebar.addPanel == "function"))
window.sidebar.addPanel("WordPress post: <?php echo $blogname ?>","<?php echo $pathserver ?>/wp-admin/b2sidebar.php",""); window.sidebar.addPanel("WordPress post: <?php echo $blogname ?>","<?php echo $siteurl ?>/wp-admin/b2sidebar.php","");
else else
alert('No Sidebar found! You must use Mozilla 0.9.4 or later!'); alert('No Sidebar found! You must use Mozilla 0.9.4 or later!');
} }
@ -445,7 +445,7 @@ Add the <a href="#" onClick="addPanel()">WordPress Sidebar</a>!
<?php } elseif (($is_winIE) || ($is_macIE)) { ?> <?php } elseif (($is_winIE) || ($is_macIE)) { ?>
<br /><br /> <br /><br />
<strong>SideBar</strong><br /> <strong>SideBar</strong><br />
Add this link to your favorites:<br /><a href="javascript:Q='';if(top.frames.length==0)Q=document.selection.createRange().text;void(_search=open('<?php echo $pathserver ?>/wp-admin/b2sidebar.php?text='+escape(Q)+'&popupurl='+escape(location.href)+'&popuptitle='+escape(document.title),'_search'))">WordPress Sidebar</a>. Add this link to your favorites:<br /><a href="javascript:Q='';if(top.frames.length==0)Q=document.selection.createRange().text;void(_search=open('<?php echo $siteurl ?>/wp-admin/b2sidebar.php?text='+escape(Q)+'&popupurl='+escape(location.href)+'&popuptitle='+escape(document.title),'_search'))">WordPress Sidebar</a>.
<?php } ?> <?php } ?>
</td> </td>
</tr> </tr>

4
wp-admin/b2sidebar.php
View File

@ -60,9 +60,9 @@ document.SPELLDATA.subjectname.value=subject
document.SPELLDATA.messagebodyname.value=body document.SPELLDATA.messagebodyname.value=body
document.SPELLDATA.companyID.value="custom\\http://cafelog.com" document.SPELLDATA.companyID.value="custom\\http://cafelog.com"
document.SPELLDATA.language.value=1033 document.SPELLDATA.language.value=1033
document.SPELLDATA.opener.value="<?php echo $pathserver ?>/sproxy.pl" document.SPELLDATA.opener.value="<?php echo $siteurl ?>/sproxy.pl"
document.SPELLDATA.formaction.value="http://www.spellchecker.com/spell/startspelling.asp " document.SPELLDATA.formaction.value="http://www.spellchecker.com/spell/startspelling.asp "
window.open("<?php echo $pathserver ?>/b2spell.php","Spell", window.open("<?php echo $siteurl ?>/b2spell.php","Spell",
"toolbar=no,directories=no,location=yes,resizable=yes,width=620,height=400,top=100,left=100") "toolbar=no,directories=no,location=yes,resizable=yes,width=620,height=400,top=100,left=100")
} }
//--> //-->