Changeset 945

trunk/index-smarty.php

r750	r945
16	16	define( 'NODISPLAY', false );
17	17
18		$wpsmarty->assign( 'siteurl', ~~$siteurl~~ );
	18	$wpsmarty->assign( 'siteurl', get_settings('siteurl') );
19	19	$wpsmarty->assign( 'b2_version', $wp_version );
20	20

trunk/index.php

r901	r945
16	16
17	17	<style type="text/css" media="screen">
18		@import url( <?php echo ~~$siteurl~~; ?>/wp-layout.css );
	18	@import url( <?php echo get_settings('siteurl'); ?>/wp-layout.css );
19	19	</style>
20	20
21		<link rel="stylesheet" type="text/css" media="print" href="<?php echo ~~$siteurl~~; ?>/print.css" />
	21	<link rel="stylesheet" type="text/css" media="print" href="<?php echo get_settings('siteurl'); ?>/print.css" />
22	22	<link rel="alternate" type="application/rss+xml" title="RSS 2.0" href="<?php bloginfo('rss2_url'); ?>" />
23	23	<link rel="alternate" type="application/rdf+xml" title="RDF" href="<?php bloginfo('rdf_url'); ?>" />
…	…
33	33	<body>
34	34	<div id="rap">
35		<h1 id="header"><a href="<?php echo ~~$siteurl~~; ?>" title="<?php bloginfo('name'); ?>"><?php bloginfo('name'); ?></a></h1>
	35	<h1 id="header"><a href="<?php echo get_settings('siteurl'); ?>" title="<?php bloginfo('name'); ?>"><?php bloginfo('name'); ?></a></h1>
36	36
37	37	<div id="content">
…	…
77	77	</li>
78	78	<li id="search">Search:
79		<form id="searchform" method="get" action="<?php echo $PHP_SELF; ~~/$siteurl."/".$blogfilename/~~ ?>">
	79	<form id="searchform" method="get" action="<?php echo $PHP_SELF; ?>">
80	80	<div>
81	81	<input type="text" name="s" size="15" /><br />
…	…
94	94	<li id="other">Other:
95	95	<ul>
96		<li><a href="<?php echo ~~$siteurl~~; ?>/wp-login.php">login</a></li>
97		<li><a href="<?php echo ~~$siteurl~~; ?>/wp-register.php">register</a></li>
	96	<li><a href="<?php echo get_settings('siteurl'); ?>/wp-login.php">login</a></li>
	97	<li><a href="<?php echo get_settings('siteurl'); ?>/wp-register.php">register</a></li>
98	98	</ul>
99	99	</li>

trunk/wp-admin/auth.php

r850	r945
5	5	/* Checking login & pass in the database */
6	6	function veriflog() {
7		global $~~HTTP_COOKIE_VARS,$~~cookiehash;
	7	global $cookiehash;
8	8	global $tableusers, $wpdb;
9	9
10		if (!empty($~~HTTP_COOKIE_VARS["wordpressuser_".~~$cookiehash])) {
11		$user_login = $~~HTTP_COOKIE_VARS["wordpressuser_".~~$cookiehash];
12		$user_pass_md5 = $~~HTTP_COOKIE_VARS["wordpresspass_".~~$cookiehash];
	10	if (!empty($_COOKIE['wordpressuser_' . $cookiehash])) {
	11	$user_login = $_COOKIE['wordpressuser_' . $cookiehash];
	12	$user_pass_md5 = $_COOKIE['wordpresspass_' . $cookiehash];
13	13	} else {
14	14	return false;
…	…
38	38	header('Cache-Control: no-cache, must-revalidate');
39	39	header('Pragma: no-cache');
40		if (!empty($~~HTTP_COOKIE_VARS["wordpressuser_".~~$cookiehash])) {
	40	if (!empty($_COOKIE['wordpressuser_' . $cookiehash])) {
41	41	$error="<strong>Error</strong>: wrong login or password.";
42	42	}
43		$redir = ~~"Location: $siteurl/wp-login.php?redirect_to=" . urlencode($HTTP_SERVER_VARS["REQUEST_URI"~~]);
	43	$redir = 'Location: ' . get_settings('siteurl') . '/wp-login.php?redirect_to=' . urlencode($_SERVER['REQUEST_URI']);
44	44	header($redir);
45	45	exit();

trunk/wp-admin/index.php

r825	r945
7	7
8	8	if (0 == $user_level) {
9		$redirect_to = ~~$siteurl~~ . '/wp-admin/profile.php';
	9	$redirect_to = get_settings('siteurl') . '/wp-admin/profile.php';
10	10	} else {
11		$redirect_to = ~~$siteurl~~ . '/wp-admin/post.php';
	11	$redirect_to = get_settings('siteurl') . '/wp-admin/post.php';
12	12	}
13	13	header ("Location: $redirect_to");

trunk/wp-admin/install.php

r921	r945
677	677
678	678	<?php
679		$url = $~~HTTP_POST_VARS~~['url'];
	679	$url = $_POST['url'];
680	680	if (isset($url)) {
681	681	$query= "UPDATE $tableoptions set option_value='$url' where option_id=1"; //siteurl

trunk/wp-admin/link-add.php

r745	r945
238	238
239	239	<div class="wrap">
240		<p>You can drag <a href="javascript:void(linkmanpopup=window.open('<?php echo ~~$siteurl~~; ?>/wp-admin/link-add.php?action=popup&linkurl='+escape(location.href)+'&name='+escape(document.title),'LinkManager','scrollbars=yes,width=750,height=550,left=15,top=15,status=yes,resizable=yes'));linkmanpopup.focus();window.focus();linkmanpopup.focus();" title="Link add bookmarklet">Link This</a> to your toolbar and when you click it a window will pop up that will allow you to add whatever site you're on to your links! Right now this only works on Mozilla or Netscape, but we're working on it.</p>
	240	<p>You can drag <a href="javascript:void(linkmanpopup=window.open('<?php echo get_settings('siteurl'); ?>/wp-admin/link-add.php?action=popup&linkurl='+escape(location.href)+'&name='+escape(document.title),'LinkManager','scrollbars=yes,width=750,height=550,left=15,top=15,status=yes,resizable=yes'));linkmanpopup.focus();window.focus();linkmanpopup.focus();" title="Link add bookmarklet">Link This</a> to your toolbar and when you click it a window will pop up that will allow you to add whatever site you're on to your links! Right now this only works on Mozilla or Netscape, but we're working on it.</p>
241	241	</div>
242	242

trunk/wp-admin/menu.php

r872	r945
22	22
23	23	?>
24		<li><a href="<?php echo "$siteurl/$blogfilename"; ?>" title="View your site">View site</a></li>
25		<li class="last"><a href="<?php echo $siteurl ?>/wp-login.php?action=logout" title="Logout of this account">Logout (<?php echo stripslashes($user_nickname) ?>)</a></li>
	24	<li><a href="<?php echo get_settings('siteurl') . '/' . get_settings('blogfilename'); ?>" title="View your site">View site</a></li>
	25	<li class="last"><a href="<?php echo get_settings('siteurl')
	26	?>/wp-login.php?action=logout" title="Logout of this account">Logout (<?php echo stripslashes($user_nickname) ?>)</a></li>
26	27	</ul>

trunk/wp-admin/options-permalink.php

r863	r945
97	97	<p>Using the permalink structure value you currently have, <code><?php echo $permalink_structure; ?></code>, these are the mod_rewrite rules you should have in your <code>.htaccess</code> file.</p>
98	98	<?php
99		$site_root = str_replace('http://', '', trim(~~$siteurl~~));
	99	$site_root = str_replace('http://', '', trim(get_settings('siteurl')));
100	100	$site_root = preg_replace('\|([^/])(.)\|i', '$2', $site_root);
101	101	if ('/' != substr($site_root, -1)) $site_root = $site_root . '/';

trunk/wp-admin/post.php

r927	r945
425	425
426	426	$sendback = $HTTP_SERVER_VARS['HTTP_REFERER'];
427		if (strstr($sendback, 'post.php')) $sendback = ~~$siteurl~~ .'/wp-admin/post.php';
	427	if (strstr($sendback, 'post.php')) $sendback = get_settings('siteurl') .'/wp-admin/post.php';
428	428	header ('Location: ' . $sendback);
429	429
…	…
473	473	echo "<p>Are you sure you want to do that?</p>\n";
474	474
475		echo "<form action=~~\"$siteurl/wp-admin/post.php\" method=\"get\"~~>\n";
	475	echo "<form action='".get_settings('siteurl')."/wp-admin/post.php' method='get'>\n";
476	476	echo "<input type=\"hidden\" name=\"action\" value=\"deletecomment\" />\n";
477	477	echo "<input type=\"hidden\" name=\"p\" value=\"$p\" />\n";
…	…
480	480	echo "<input type=\"submit\" value=\"Yes\" />";
481	481	echo "  ";
482		echo "<input type=\"button\" value=\"No\" onClick=\"self.location='~~$siteurl~~/wp-admin/edit.php?p=$p&c=1#comments';\" />\n";
	482	echo "<input type=\"button\" value=\"No\" onClick=\"self.location='". get_settings('siteurl') ."/wp-admin/edit.php?p=$p&c=1#comments';\" />\n";
483	483	echo "</form>\n";
484	484	echo "</div>\n";
…	…
515	515	header('Location: ' . $HTTP_SERVER_VARS['HTTP_REFERER']);
516	516	} else {
517		header('Location: '.~~$siteurl~~.'/wp-admin/edit.php?p='.$p.'&c=1#comments');
	517	header('Location: '. get_settings('siteurl') .'/wp-admin/edit.php?p='.$p.'&c=1#comments');
518	518	}
519	519
…	…
543	543	header('Location: ' . $HTTP_SERVER_VARS['HTTP_REFERER']);
544	544	} else {
545		header('Location: '.~~$siteurl~~.'/wp-admin/edit.php?p='.$p.'&c=1#comments');
	545	header('Location: '. get_settings('siteurl') .'/wp-admin/edit.php?p='.$p.'&c=1#comments');
546	546	}
547	547
…	…
568	568	echo "<p>Comment has been approved.</p>\n";
569	569
570		echo "<form action=\"~~$siteurl~~/wp-admin/edit.php?p=$p&c=1#comments\" method=\"get\">\n";
	570	echo "<form action=\"". get_settings('siteurl') ."/wp-admin/edit.php?p=$p&c=1#comments\" method=\"get\">\n";
571	571	echo "<input type=\"hidden\" name=\"p\" value=\"$p\" />\n";
572	572	echo "<input type=\"hidden\" name=\"c\" value=\"1\" />\n";
…	…
603	603	header('Location: ' . $HTTP_SERVER_VARS['HTTP_REFERER']);
604	604	} else {
605		header('Location: '.~~$siteurl~~.'/wp-admin/edit.php?p='.$p.'&c=1#comments');
	605	header('Location: '. get_settings('siteurl') .'/wp-admin/edit.php?p='.$p.'&c=1#comments');
606	606	}
607	607
…	…
707	707	if ($is_NS4 \|\| $is_gecko) {
708	708	?>
709		<a href="javascript:if(navigator.userAgent.indexOf('Safari') >= 0){Q=getSelection();}else{Q=document.selection?document.selection.createRange().text:document.getSelection();}void(window.open('<?php echo ~~$siteurl~~ ?>/wp-admin/bookmarklet.php?text='+escape(Q)+'&popupurl='+escape(location.href)+'&popuptitle='+escape(document.title),'WordPress bookmarklet','scrollbars=yes,width=600,height=460,left=100,top=150,status=yes'));">Press It
	709	<a href="javascript:if(navigator.userAgent.indexOf('Safari') >= 0){Q=getSelection();}else{Q=document.selection?document.selection.createRange().text:document.getSelection();}void(window.open('<?php echo get_settings('siteurl') ?>/wp-admin/bookmarklet.php?text='+escape(Q)+'&popupurl='+escape(location.href)+'&popuptitle='+escape(document.title),'WordPress bookmarklet','scrollbars=yes,width=600,height=460,left=100,top=150,status=yes'));">Press It
710	710	- <?php echo $blogname ?></a>
711	711	<?php
712	712	} else if ($is_winIE) {
713	713	?>
714		<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=yes,width=600,height=<?php echo $bookmarklet_height ?>,left=100,top=150,status=yes'));btw.focus();">Press it
	714	<a href="javascript:Q='';if(top.frames.length==0)Q=document.selection.createRange().text;void(btw=window.open('<?php echo get_settings('siteurl') ?>/wp-admin/bookmarklet.php?text='+escape(Q)+'<?php echo $bookmarklet_tbpb ?>&popupurl='+escape(location.href)+'&popuptitle='+escape(document.title),'bookmarklet','scrollbars=yes,width=600,height=<?php echo $bookmarklet_height ?>,left=100,top=150,status=yes'));btw.focus();">Press it
715	715	- <?php echo $blogname ?></a>
716	716	<script type="text/javascript" language="JavaScript">
…	…
728	728	} else if ($is_opera) {
729	729	?>
730		<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=yes,width=600,height=<?php echo $bookmarklet_height ?>,left=100,top=150,status=yes'));">Press it
	730	<a href="javascript:void(window.open('<?php echo get_settings('siteurl'); ?>/wp-admin/bookmarklet.php?popupurl='+escape(location.href)+'&popuptitle='+escape(document.title)+'<?php echo $bookmarklet_tbpb ?>','bookmarklet','scrollbars=yes,width=600,height=<?php echo $bookmarklet_height ?>,left=100,top=150,status=yes'));">Press it
731	731	- <?php echo $blogname ?></a>
732	732	<?php
733	733	} else if ($is_macIE) {
734	734	?>
735		<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=yes,width=600,height=<?php echo $bookmarklet_height ?>,left=100,top=150,status=yes'));btw.focus();">Press it
	735	<a href="javascript:Q='';if(top.frames.length==0);void(btw=window.open('<?php echo get_settings('siteurl'); ?>/wp-admin/bookmarklet.php?text='+escape(document.getSelection())+'&popupurl='+escape(location.href)+'&popuptitle='+escape(document.title)+'<?php echo $bookmarklet_tbpb ?>','bookmarklet','scrollbars=yes,width=600,height=<?php echo $bookmarklet_height ?>,left=100,top=150,status=yes'));btw.focus();">Press it
736	736	- <?php echo $blogname ?></a>
737	737	<?php

trunk/wp-admin/profile.php

r850	r945
192	192	<p>To have a one-click bookmarklet, just copy and paste this<br />into a new text file:</p>
193	193	<?php
194		$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\"";
	194	$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('". get_settings('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\"";
195	195	?>
196	196	<pre style="margin: 20px; background-color: #cccccc; border: 1px dashed #333333; padding: 5px; font-size: 12px;"><?php echo $regedit; ?></pre>
…	…
324	324	{
325	325	if ((typeof window.sidebar == "object") && (typeof window.sidebar.addPanel == "function"))
326		window.sidebar.addPanel("WordPress Post: <?php echo $blogname ?>","<?php echo ~~$siteurl~~ ?>/wp-admin/sidebar.php","");
	326	window.sidebar.addPanel("WordPress Post: <?php echo $blogname ?>","<?php echo get_settings('siteurl'); ?>/wp-admin/sidebar.php","");
327	327	else
328	328	alert('No Sidebar found! You must use Mozilla 0.9.4 or later!');
…	…
334	334	<strong>SideBar</strong><br />
335	335	Add this link to your favorites:<br />
336		<a href="javascript:Q='';if(top.frames.length==0)Q=document.selection.createRange().text;void(_search=open('<?php echo $siteurl ?>/wp-admin/sidebar.php?text='+escape(Q)+'&popupurl='+escape(location.href)+'&popuptitle='+escape(document.title),'_search'))">WordPress
	336	<a href="javascript:Q='';if(top.frames.length==0)Q=document.selection.createRange().text;void(_search=open('<?php echo get_settings('siteurl');
	337	?>/wp-admin/sidebar.php?text='+escape(Q)+'&popupurl='+escape(location.href)+'&popuptitle='+escape(document.title),'_search'))">WordPress
337	338	Sidebar</a>.
338	339

trunk/wp-admin/templates.php

r859	r945
67	67
68	68	if ('' == $file) {
69		if ('' != ~~$blogfilename~~) {
70		$file = ~~$blogfilename~~;
	69	if ('' != get_settings('blogfilename')) {
	70	$file = get_settings('blogfilename');
71	71	} else {
72	72	$file = 'index.php';

trunk/wp-admin/users.php

r925	r945
259	259	<div class="wrap">
260	260	<h2>Add User</h2>
261		<p>Users can <a href="<?php echo ~~$siteurl~~ ?>/wp-register.php">register themselves</a> or you can manually create users here.</p>
	261	<p>Users can <a href="<?php echo get_settings('siteurl'); ?>/wp-register.php">register themselves</a> or you can manually create users here.</p>
262	262	<form action="" method="post" name="adduser" id="adduser">
263	263	<table border="0" cellspacing="5" cellpadding="3">

trunk/wp-blog-header.php

r941	r945
82	82	@header("Cache-Control: post-check=0, pre-check=0", false);
83	83	@header("Pragma: no-cache"); // HTTP/1.0
84		@header (~~"X-Pingback: $siteurl/xmlrpc.php"~~);
	84	@header ('X-Pingback: '. get_settings('siteurl') . '/xmlrpc.php');
85	85	} else {
86	86	// We're showing a feed, so WP is indeed the only thing that last changed
87	87	@header('Last Modified: ' . gmdate(get_lastpostmodified()));
88		@header (~~"X-Pingback: $siteurl/xmlrpc.php"~~);
	88	@header ('X-Pingback: ' . get_settings('siteurl') . '/xmlrpc.php');
89	89	}
90	90

trunk/wp-comments-popup.php

r880	r945
24	24	<h2 id="comments">Comments</h2>
25	25
26		<p><a href="<?php echo ~~$siteurl~~; ?>/wp-commentsrss2.php?p=<?php echo $post->ID; ?>">RSS feed for comments on this post.</a></p>
	26	<p><a href="<?php echo get_settings('siteurl'); ?>/wp-commentsrss2.php?p=<?php echo $post->ID; ?>">RSS feed for comments on this post.</a></p>
27	27
28	28	<?php if ('open' == $post->ping_status) { ?>
…	…
59	59	<p>Line and paragraph breaks automatic, website trumps email, <acronym title="Hypertext Markup Language">HTML</acronym> allowed: <code><?php echo allowed_tags(); ?></code></p>
60	60
61		<form action="<?php echo ~~$siteurl~~; ?>/wp-comments-post.php" method="post" id="commentform">
	61	<form action="<?php echo get_settings('siteurl'); ?>/wp-comments-post.php" method="post" id="commentform">
62	62	<p>
63	63	<input type="text" name="author" id="author" class="textarea" value="<?php echo $comment_author; ?>" size="28" tabindex="1" />

trunk/wp-comments.php

r808	r945
48	48	<p>Line and paragraph breaks automatic, website trumps email, <acronym title="Hypertext Markup Language">HTML</acronym> allowed: <code><?php echo allowed_tags(); ?></code></p>
49	49
50		<form action="<?php echo ~~$siteurl~~; ?>/wp-comments-post.php" method="post" id="commentform">
	50	<form action="<?php echo get_settings('siteurl'); ?>/wp-comments-post.php" method="post" id="commentform">
51	51	<p>
52	52	<input type="text" name="author" id="author" class="textarea" value="<?php echo $comment_author; ?>" size="28" tabindex="1" />

trunk/wp-includes/functions.php

r943	r945
204	204	// determine the post ID it represents.
205	205	function url_to_postid($url = '') {
206		global $wpdb, $tableposts, $siteurl;
207
	206	global $wpdb, $tableposts;
	207
	208	$siteurl = get_settings('siteurl');
208	209	// Take a link like 'http://example.com/blog/something'
209	210	// and extract just the '/something':
…	…
537	538	function pingWeblogs($blog_ID = 1) {
538	539	// original function by Dries Buytaert for Drupal
539		global $use_weblogsping, $blogname~~,$siteurl,$blogfilename~~;
540		if ((!(($blogname=="my weblog") && (~~$siteurl=="http://example.com") && ($blogfilename=="wp.php"))) && (!preg_match("/localhost\//",$siteurl~~)) && ($use_weblogsping)) {
	540	global $use_weblogsping, $blogname;
	541	if ((!(($blogname=="my weblog") && (get_settings('siteurl')=="http://example.com") && (get_settings('blogfilename') == "wp.php"))) && (!preg_match("/localhost\//", get_settings('siteurl'))) && ($use_weblogsping)) {
541	542	$client = new xmlrpc_client("/RPC2", "rpc.weblogs.com", 80);
542		$message = new xmlrpcmsg("weblogUpdates.ping", array(new xmlrpcval($blogname), new xmlrpcval($siteurl."/".$blogfilename)));
	543	$message = new xmlrpcmsg("weblogUpdates.ping", array(new xmlrpcval($blogname),
	544	new xmlrpcval(get_settings('siteurl') . '/' . get_settings('blogfilename')
	545	)));
543	546	$result = $client->send($message);
544	547	if (!$result \|\| $result->faultCode()) {
…	…
569	572	// pings Caf�g.com
570	573	function pingCafelog($cafelogID,$title='',$p='') {
571		global $use_cafelogping, $blogname~~, $siteurl, $blogfilename~~;
572		if ((!(($blogname=="my weblog") && (~~$siteurl=="http://example.com") && ($blogfilename=="wp.php"))) && (!preg_match("/localhost\//",$siteurl~~)) && ($use_cafelogping) && ($cafelogID != '')) {
	574	global $use_cafelogping, $blogname;
	575	if ((!(($blogname=="my weblog") && (get_settings('siteurl') == "http://example.com") && (get_settings('blogfilename')=="wp.php"))) && (!preg_match("/localhost\//", get_settings('siteurl'))) && ($use_cafelogping) && ($cafelogID != '')) {
573	576	$client = new xmlrpc_client("/xmlrpc.php", "cafelog.tidakada.com", 80);
574	577	$message = new xmlrpcmsg("b2.ping", array(new xmlrpcval($cafelogID), new xmlrpcval($title), new xmlrpcval($p)));
…	…
585	588	// pings Blo.gs
586	589	function pingBlogs($blog_ID="1") {
587		global $use_blodotgsping, $blodotgsping_url, $use_rss, $blogname~~, $siteurl, $blogfilename~~;
588		if ((!(($blogname=='my weblog') && (~~$siteurl=='http://example.com') && ($blogfilename=='wp.php'))) && (!preg_match('/localhost\//',$siteurl~~)) && ($use_blodotgsping)) {
589		$url = ($blodotgsping_url == 'http://example.com') ? ~~$siteurl.'/'.$blogfilename~~ : $blodotgsping_url;
	590	global $use_blodotgsping, $blodotgsping_url, $use_rss, $blogname;
	591	if ((!(($blogname=='my weblog') && (get_settings('siteurl')=='http://example.com') && (get_settings('blogfilename')=='wp.php'))) && (!preg_match('/localhost\//',get_settings('siteurl'))) && ($use_blodotgsping)) {
	592	$url = ($blodotgsping_url == 'http://example.com') ? get_settings('siteurl').'/'.get_settings('blogfilename') : $blodotgsping_url;
590	593	$client = new xmlrpc_client('/', 'ping.blo.gs', 80);
591	594	if ($use_rss) {
592		$message = new xmlrpcmsg('weblogUpdates.extendedPing', array(new xmlrpcval($blogname), new xmlrpcval($url), new xmlrpcval($url), new xmlrpcval(~~$siteurl~~.'/b2rss.xml')));
	595	$message = new xmlrpcmsg('weblogUpdates.extendedPing', array(new xmlrpcval($blogname), new xmlrpcval($url), new xmlrpcval($url), new xmlrpcval(get_settings('siteurl').'/b2rss.xml')));
593	596	} else {
594	597	$message = new xmlrpcmsg('weblogUpdates.ping', array(new xmlrpcval($blogname), new xmlrpcval($url)));
…	…
658	661
659	662	function make_url_footnote($content) {
660		~~global $siteurl;~~
661	663	preg_match_all('/<a(.+?)href=\"(.+?)\"(.*?)>(.+?)<\/a>/', $content, $matches);
662	664	$j = 0;
…	…
669	671	$link_text = $matches[4][$i];
670	672	$content = str_replace($link_match, $link_text.' '.$link_number, $content);
671		$link_url = (strtolower(substr($link_url,0,7)) != 'http://') ? ~~$siteurl.~~$link_url : $link_url;
	673	$link_url = (strtolower(substr($link_url,0,7)) != 'http://') ? get_settings('siteurl') . $link_url : $link_url;
672	674	$links_summary .= "\n".$link_number.' '.$link_url;
673	675	}
…	…
736	738	function pingback($content, $post_ID) {
737	739	// original code by Mort (http://mort.mine.nu:8080)
738		global $~~siteurl, $blogfilename, $~~wp_version;
	740	global $wp_version;
739	741	$log = debug_fopen('./pingback.log', 'a');
740	742	$post_links = array();
…	…
1015	1017	global $wpdb, $tablecomments, $tableposts, $tableusers;
1016	1018	global $querystring_start, $querystring_equal, $querystring_separator;
1017		global $blog~~filename, $blogname, $siteurl~~, $blog_charset;
	1019	global $blogname, $blog_charset;
1018	1020
1019	1021	$comment = $wpdb->get_row("SELECT * FROM $tablecomments WHERE comment_ID='$comment_id' LIMIT 1");
…	…
1076	1078	global $wpdb, $tablecomments, $tableposts, $tableusers;
1077	1079	global $querystring_start, $querystring_equal, $querystring_separator;
1078		global $blog~~filename, $blogname, $siteurl~~, $blog_charset;
	1080	global $blogname, $blog_charset;
1079	1081
1080	1082	$comment = $wpdb->get_row("SELECT * FROM $tablecomments WHERE comment_ID='$comment_id' LIMIT 1");
…	…
1091	1093	$notify_message .= "Whois : http://ws.arin.net/cgi-bin/whois.pl?queryinput=$comment->comment_author_IP\r\n";
1092	1094	$notify_message .= "Comment:\r\n".stripslashes($comment->comment_content)."\r\n\r\n";
1093		$notify_message .= "To approve this comment, visit: ~~$siteurl~~/wp-admin/post.php?action=mailapprovecomment&p=".$comment->comment_post_ID."&comment=$comment_id\r\n";
1094		$notify_message .= "To delete this comment, visit: ~~$siteurl~~/wp-admin/post.php?action=confirmdeletecomment&p=".$comment->comment_post_ID."&comment=$comment_id\r\n";
	1095	$notify_message .= "To approve this comment, visit: " . get_settings('siteurl') . "/wp-admin/post.php?action=mailapprovecomment&p=".$comment->comment_post_ID."&comment=$comment_id\r\n";
	1096	$notify_message .= "To delete this comment, visit: " . get_settings('siteurl') . "/wp-admin/post.php?action=confirmdeletecomment&p=".$comment->comment_post_ID."&comment=$comment_id\r\n";
1095	1097	$notify_message .= "Currently $comments_waiting comments are waiting for approval. Please visit the moderation panel:\r\n";
1096		$notify_message .= ~~"$siteurl~~/wp-admin/moderation.php\r\n";
	1098	$notify_message .= get_settings('siteurl') . "/wp-admin/moderation.php\r\n";
1097	1099
1098	1100	$subject = '[' . stripslashes($blogname) . '] Please approve: "' .stripslashes($post->post_title).'"';
…	…
1279	1281
1280	1282	function is_referer_search_engine($engine = 'google') {
1281		global $siteurl;
1282
1283		$referer = urldecode($_SERVER[HTTP_REFERER]);
	1283	$siteurl = get_settings('siteurl');
	1284	$referer = urldecode($_SERVER['HTTP_REFERER']);
1284	1285	//echo "referer is: $referer<br />";
1285	1286	if ( ! $engine ) {

trunk/wp-includes/template-functions-category.php

r893	r945
17	17
18	18	function get_category_link($echo = false, $category_id, $category_nicename) {
19		global $wpdb, $tablecategories, $post, $querystring_start, $querystring_equal, $~~siteurl, $blogfilename, $~~cache_categories;
	19	global $wpdb, $tablecategories, $post, $querystring_start, $querystring_equal, $cache_categories;
20	20	$cat_ID = $category_id;
21	21	$permalink_structure = get_settings('permalink_structure');
22	22
23	23	if ('' == $permalink_structure) {
24		$file = ~~"$siteurl/$blogfilename"~~;
	24	$file = get_settings('siteurl') . '/' . get_settings('blogfilename');
25	25	$link = $file.$querystring_start.'cat'.$querystring_equal.$cat_ID;
26	26	} else {
…	…
28	28	// Get any static stuff from the front
29	29	$front = substr($permalink_structure, 0, strpos($permalink_structure, '%'));
30		$link = ~~$siteurl~~ . $front . 'category/';
	30	$link = get_settings('siteurl') . $front . 'category/';
31	31	if ($parent=$cache_categories[$category_id]->category_parent) $link .= get_category_parents($parent, FALSE, '/', TRUE);
32	32	$link .= $category_nicename . '/';
…	…
38	38
39	39	function get_category_rss_link($echo = false, $category_id, $category_nicename) {
40		global $querystring_start, $querystring_equal~~, $siteurl~~;
	40	global $querystring_start, $querystring_equal;
41	41	$cat_ID = $category_id;
42	42	$permalink_structure = get_settings('permalink_structure');
43	43
44	44	if ('' == $permalink_structure) {
45		$file = ~~"$siteurl/wp-rss2.php"~~;
	45	$file = get_settings('siteurl') . '/wp-rss2.php';
46	46	$link = $file . $querystring_start . 'cat' . $querystring_equal . $category_id;
47	47	} else {
…	…
186	186	$selected=0, $hide=0) {
187	187	global $tablecategories, $tableposts, $tablepost2cat, $wpdb;
188		global $pagenow~~, $siteurl, $blogfilename~~;
	188	global $pagenow;
189	189	global $querystring_start, $querystring_equal, $querystring_separator;
190		if (($file == 'blah') \|\| ($file == '')) $file = ~~"$siteurl/$blogfilename"~~;
	190	if (($file == 'blah') \|\| ($file == '')) $file = get_settings('siteurl') . '/' . get_settings('blogfilename');
191	191	if (!$selected) $selected=$cat;
192	192	$sort_column = 'cat_'.$sort_column;
…	…
253	253	function list_cats($optionall = 1, $all = 'All', $sort_column = 'ID', $sort_order = 'asc', $file = '', $list = true, $optiondates = 0, $optioncount = 0, $hide_empty = 1, $use_desc_for_title = 1, $children=FALSE, $child_of=0, $categories=0, $recurse=0) {
254	254	global $tablecategories, $tableposts, $tablepost2cat, $wpdb;
255		global $pagenow~~, $siteurl, $blogfilename~~;
	255	global $pagenow;
256	256	global $querystring_start, $querystring_equal, $querystring_separator;
257	257	// Optiondates now works
258	258	if ('' == $file) {
259		$file = "$siteurl/~~$blogfilename"~~;
	259	$file = "$siteurl/" . get_settings('blogfilename');
260	260	}
261	261	if (intval($categories)==0){

trunk/wp-includes/template-functions-comment.php

r924	r945
61	61	function comments_popup_link($zero='No Comments', $one='1 Comment', $more='% Comments', $CSSclass='', $none='Comments Off') {
62	62	global $id, $wpcommentspopupfile, $wpcommentsjavascript, $post, $wpdb, $tablecomments, $HTTP_COOKIE_VARS, $cookiehash;
63		global $querystring_start, $querystring_equal, $querystring_separator~~, $siteurl~~;
	63	global $querystring_start, $querystring_equal, $querystring_separator;
64	64	global $comment_count_cache, $single;
65	65	if (!$single) {
…	…
81	81	echo '<a href="';
82	82	if ($wpcommentsjavascript) {
83		echo ~~$siteurl.'/'.~~$wpcommentspopupfile.$querystring_start.'p'.$querystring_equal.$id.$querystring_separator.'c'.$querystring_equal.'1';
	83	echo get_settings('siteurl') . '/' . $wpcommentspopupfile.$querystring_start.'p'.$querystring_equal.$id.$querystring_separator.'c'.$querystring_equal.'1';
84	84	//echo get_permalink();
85	85	echo '" onclick="wpopen(this.href); return false"';
…	…
228	228	function comments_rss_link($link_text='Comments RSS', $commentsrssfilename = 'wp-commentsrss2.php') {
229	229	global $id;
230		global $querystring_start, $querystring_equal, $querystring_separator~~, $siteurl~~;
	230	global $querystring_start, $querystring_equal, $querystring_separator;
231	231
232	232	if ('' != get_settings('permalink_structure')) {
233	233	$url = trailingslashit(get_permalink()) . 'rss2/';
234	234	} else {
235		$url = ~~$siteurl.'/'.~~$commentsrssfilename.$querystring_start.'p'.$querystring_equal.$id;
	235	$url = get_settings('siteurl') . '/' . $commentsrssfilename.$querystring_start.'p'.$querystring_equal.$id;
236	236	}
237	237
…	…
285	285
286	286	function trackback_rdf($timezone = 0) {
287		global $~~siteurl, $id, $HTTP_SERVER_VARS~~;
288		if (!stristr($~~HTTP_SERVER_VARS~~['HTTP_USER_AGENT'], 'W3C_Validator')) {
	287	global $id;
	288	if (!stristr($_SERVER['HTTP_USER_AGENT'], 'W3C_Validator')) {
289	289	echo '<rdf:RDF xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
290	290	xmlns:dc="http://purl.org/dc/elements/1.1/"

trunk/wp-includes/template-functions-general.php

r938	r945
23	23
24	24	function get_bloginfo($show='') {
25		global $~~siteurl, $blogfilename, $blogname, $blogdescription, $siteurl~~, $admin_email;
	25	global $blogname, $blogdescription, $admin_email;
26	26
27	27	$do_perma = 0;
28		$feed_url = ~~$siteurl~~;
29		$comment_feed_url = ~~$siteurl~~;
	28	$feed_url = get_settings('siteurl');
	29	$comment_feed_url = get_settings('siteurl');
30	30
31	31	if ('' != get_settings('permalink_structure')) {
32	32	$do_perma = 1;
33		$feed_url = ~~$siteurl~~ . '/feed';
34		$comment_feed_url = ~~$siteurl~~ . '/comments/feed';
	33	$feed_url = get_settings('siteurl') . '/feed';
	34	$comment_feed_url = get_settings('siteurl') . '/comments/feed';
35	35	}
36	36
37	37	switch($show) {
38	38	case 'url':
39		$output = ~~$siteurl.'/'.$blogfilename~~;
	39	$output = get_settings('siteurl') .'/'. get_settings('blogfilename');
40	40	break;
41	41	case 'description':
…	…
43	43	break;
44	44	case 'rdf_url':
45		$output = ~~$siteurl~~.'/wp-rdf.php';
	45	$output = get_settings('siteurl') .'/wp-rdf.php';
46	46	if ($do_perma) {
47	47	$output = $feed_url . '/rdf/';
…	…
49	49	break;
50	50	case 'rss_url':
51		$output = ~~$siteurl~~.'/wp-rss.php';
	51	$output = get_settings('siteurl') .'/wp-rss.php';
52	52	if ($do_perma) {
53	53	$output = $feed_url . '/rss/';
…	…
55	55	break;
56	56	case 'rss2_url':
57		$output = ~~$siteurl~~.'/wp-rss2.php';
	57	$output = get_settings('siteurl') .'/wp-rss2.php';
58	58	if ($do_perma) {
59	59	$output = $feed_url . '/rss2/';
…	…
61	61	break;
62	62	case 'atom_url':
63		$output = ~~$siteurl~~.'/wp-atom.php';
	63	$output = get_settings('siteurl') .'/wp-atom.php';
64	64	if ($do_perma) {
65	65	$output = $feed_url . '/atom/';
…	…
67	67	break;
68	68	case 'comments_rss2_url':
69		$output = ~~$siteurl~~.'/wp-commentsrss2.php';
	69	$output = get_settings('siteurl') .'/wp-commentsrss2.php';
70	70	if ($do_perma) {
71	71	$output = $comment_feed_url . '/rss2/';
…	…
73	73	break;
74	74	case 'pingback_url':
75		$output = ~~$siteurl~~.'/xmlrpc.php';
	75	$output = get_settings('siteurl') .'/xmlrpc.php';
76	76	break;
77	77	case 'admin_email':
…	…
205	205
206	206	function get_archives($type='', $limit='', $format='html', $before = "", $after = "", $show_post_count = false) {
207		global $tableposts, $time_difference~~, $siteurl, $blogfilename~~;
	207	global $tableposts, $time_difference;
208	208	global $querystring_start, $querystring_equal, $querystring_separator, $month, $wpdb, $start_of_week;
209	209
…	…
220	220
221	221	// archive link url
222		$archive_link_m = ~~$siteurl.'/'.$blogfilename~~.$querystring_start.'m'.$querystring_equal; # monthly archive;
223		$archive_link_w = ~~$siteurl.'/'.$blogfilename~~.$querystring_start.'w'.$querystring_equal; # weekly archive;
224		$archive_link_p = ~~$siteurl.'/'.$blogfilename~~.$querystring_start.'p'.$querystring_equal; # post-by-post archive;
	222	$archive_link_m = get_settings('siteurl').'/'.get_settings('blogfilename').$querystring_start.'m'.$querystring_equal; # monthly archive;
	223	$archive_link_w = get_settings('siteurl').'/'.get_settings('blogfilename').$querystring_start.'w'.$querystring_equal; # weekly archive;
	224	$archive_link_p = get_settings('siteurl').'/'.get_settings('blogfilename').$querystring_start.'p'.$querystring_equal; # post-by-post archive;
225	225
226	226	// over-ride general date format ? 0 = no: use the date format set in Options, 1 = yes: over-ride
…	…
284	284	$arc_week_start = date_i18n($archive_week_start_date_format, $arc_week['start']);
285	285	$arc_week_end = date_i18n($archive_week_end_date_format, $arc_week['end']);
286		$url = sprintf('%s/%s%sm%s%s%sw%s%d', ~~$siteurl, $blogfilename~~, $querystring_start,
	286	$url = sprintf('%s/%s%sm%s%s%sw%s%d', get_settings('siteurl'), get_settings('blogfilename'), $querystring_start,
287	287	$querystring_equal, $arc_year, $querystring_separator,
288	288	$querystring_equal, $arcresult->week);

trunk/wp-includes/template-functions-links.php

r935	r945
36	36
37	37	function permalink_single_rss($file = '') {
38		~~global $siteurl;~~
39	38	echo get_permalink();
40	39	}
…	…
42	41	function get_permalink($id=false) {
43	42	global $post, $wpdb, $tableposts;
44		global $~~siteurl, $blogfilename, $~~querystring_start, $querystring_equal;
	43	global $querystring_start, $querystring_equal;
45	44
46	45	$rewritecode = array(
…	…
61	60	$post->ID
62	61	);
63		return ~~$siteurl~~ . str_replace($rewritecode, $rewritereplace, get_settings('permalink_structure'));
	62	return get_settings('siteurl') . str_replace($rewritecode, $rewritereplace, get_settings('permalink_structure'));
64	63	} else { // if they're not using the fancy permalink option
65		return ~~$siteurl . '/' . $blogfilename~~.$querystring_start.'p'.$querystring_equal.$post->ID;
	64	return get_settings('siteurl') . '/' . get_settings('blogfilename').$querystring_start.'p'.$querystring_equal.$post->ID;
66	65	}
67	66	} else { // if an ID is given
…	…
76	75	$id
77	76	);
78		return ~~$siteurl~~ . str_replace($rewritecode, $rewritereplace, get_settings('permalink_structure'));
	77	return get_settings('siteurl') . str_replace($rewritecode, $rewritereplace, get_settings('permalink_structure'));
79	78	} else {
80		return ~~$siteurl . '/' . $blogfilename~~.$querystring_start.'p'.$querystring_equal.$id;
	79	return get_settings('siteurl') . '/' . get_settings('blogfilename').$querystring_start.'p'.$querystring_equal.$id;
81	80	}
82	81	}
…	…
84	83
85	84	function get_month_link($year, $month) {
86		global $~~siteurl, $blogfilename, $~~querystring_start, $querystring_equal;
	85	global $querystring_start, $querystring_equal;
87	86	if (!$year) $year = date('Y', time()+($time_difference * 3600));
88	87	if (!$month) $month = date('m', time()+($time_difference * 3600));
…	…
95	94	$monthlink = str_replace('%monthnum%', zeroise(intval($month), 2), $monthlink);
96	95	$monthlink = str_replace('%post_id%', '', $monthlink);
97		return ~~$siteurl~~ . $monthlink;
	96	return get_settings('siteurl') . $monthlink;
98	97	} else {
99		return ~~$siteurl.'/'.$blogfilename~~.$querystring_start.'m'.$querystring_equal.$year.zeroise($month, 2);
	98	return get_settings('siteurl') .'/'. get_settings('blogfilename') .$querystring_start.'m'.$querystring_equal.$year.zeroise($month, 2);
100	99	}
101	100	}
102	101
103	102	function get_day_link($year, $month, $day) {
104		global $~~siteurl, $blogfilename, $~~querystring_start, $querystring_equal;
	103	global $querystring_start, $querystring_equal;
105	104	if (!$year) $year = date('Y', time()+($time_difference * 3600));
106	105	if (!$month) $month = date('m', time()+($time_difference * 3600));
…	…
115	114	$daylink = str_replace('%day%', zeroise(intval($day), 2), $daylink);
116	115	$daylink = str_replace('%post_id%', '', $daylink);
117		return ~~$siteurl~~ . $daylink;
	116	return get_settings('siteurl') . $daylink;
118	117	} else {
119		return ~~$siteurl.'/'.$blogfilename~~.$querystring_start.'m'.$querystring_equal.$year.zeroise($month, 2).zeroise($day, 2);
	118	return get_settings('siteurl') .'/'. get_settings('blogfilename') .$querystring_start.'m'.$querystring_equal.$year.zeroise($month, 2).zeroise($day, 2);
120	119	}
121	120	}
122	121
123	122	function edit_post_link($link = 'Edit This', $before = '', $after = '') {
124		global $user_level, $post~~, $siteurl~~;
	123	global $user_level, $post;
125	124
126	125	get_currentuserinfo();
…	…
135	134	}
136	135
137		$location = ~~"$siteurl~~/wp-admin/post.php?action=edit&post=$post->ID";
	136	$location = get_settings('siteurl') . "/wp-admin/post.php?action=edit&post=$post->ID";
138	137	echo "$before <a href=\"$location\">$link</a> $after";
139	138	}
140	139
141	140	function edit_comment_link($link = 'Edit This', $before = '', $after = '') {
142		global $user_level, $post, $comment~~, $siteurl~~;
	141	global $user_level, $post, $comment;
143	142
144	143	get_currentuserinfo();
…	…
153	152	}
154	153
155		$location = ~~"$siteurl~~/wp-admin/post.php?action=editcomment&comment=$comment->comment_ID";
	154	$location = get_settings('siteurl') . "/wp-admin/post.php?action=editcomment&comment=$comment->comment_ID";
156	155	echo "$before <a href=\"$location\">$link</a> $after";
157	156	}

trunk/wp-includes/template-functions-post.php

r930	r945
262	262
263	263	function previous_post($format='%', $previous='previous post: ', $title='yes', $in_same_cat='no', $limitprev=1, $excluded_categories='') {
264		global $tableposts, $id, $post, $~~siteurl, $blogfilename, $~~wpdb;
	264	global $tableposts, $id, $post, $wpdb;
265	265	global $p, $posts, $posts_per_page, $s, $single;
266	266	global $querystring_start, $querystring_equal, $querystring_separator;
…	…
300	300
301	301	function next_post($format='%', $next='next post: ', $title='yes', $in_same_cat='no', $limitnext=1, $excluded_categories='') {
302		global $tableposts, $p, $posts, $id, $post, $~~siteurl, $blogfilename, $~~wpdb;
	302	global $tableposts, $p, $posts, $id, $post, $wpdb;
303	303	global $time_difference, $single;
304	304	global $querystring_start, $querystring_equal, $querystring_separator;
…	…
340	340
341	341	function next_posts($max_page = 0) { // original by cfactor at cooltux.org
342		global $HTTP_SERVER_VARS, $~~siteurl, $blogfilename, $~~p, $paged, $what_to_show, $pagenow;
	342	global $HTTP_SERVER_VARS, $p, $paged, $what_to_show, $pagenow;
343	343	global $querystring_start, $querystring_equal, $querystring_separator;
344	344	if (empty($p) && ($what_to_show == 'paged')) {
…	…
359	359	$nextpage = intval($paged) + 1;
360	360	if (!$max_page \|\| $max_page >= $nextpage) {
361		echo ~~$siteurl~~.'/'.$pagenow.$querystring_start.
	361	echo get_settings('siteurl') .'/'.$pagenow.$querystring_start.
362	362	($qstr == '' ? '' : $qstr.$querystring_separator) .
363	363	'paged'.$querystring_equal.$nextpage;
…	…
393	393
394	394	function previous_posts() { // original by cfactor at cooltux.org
395		global $HTTP_SERVER_VARS, $~~siteurl, $blogfilename, $~~p, $paged, $what_to_show, $pagenow;
	395	global $HTTP_SERVER_VARS, $p, $paged, $what_to_show, $pagenow;
396	396	global $querystring_start, $querystring_equal, $querystring_separator;
397	397	if (empty($p) && ($what_to_show == 'paged')) {
…	…

Navigation

Legend:

trunk/index-smarty.php

trunk/index.php

trunk/wp-admin/auth.php

trunk/wp-admin/index.php

trunk/wp-admin/install.php

trunk/wp-admin/link-add.php

trunk/wp-admin/menu.php

trunk/wp-admin/options-permalink.php

trunk/wp-admin/post.php

trunk/wp-admin/profile.php

trunk/wp-admin/templates.php

trunk/wp-admin/users.php

trunk/wp-blog-header.php

trunk/wp-comments-popup.php

trunk/wp-comments.php

trunk/wp-includes/functions.php

trunk/wp-includes/template-functions-category.php

trunk/wp-includes/template-functions-comment.php

trunk/wp-includes/template-functions-general.php

trunk/wp-includes/template-functions-links.php

trunk/wp-includes/template-functions-post.php