com web/master: Remove a few more references to www.php.net and replace them with php.net.: entry/user-note.php fetch/index.php
fetch/user-notes-rss.php index.php manage/user-notes.php scripts/index.php scripts/mirror-test scripts/pregen_news scripts/rss_parse r

Commit: 9cb5a2073ba3175e0e94fffa09d4dd1c7c2c7981 Author: Daniel P. Brown <danbrown@php.net> Wed, 5 Dec 2012 11:44:15 -0500 Parents: f1ad1ad5c54b095ff98d433c26a45455439a9795 Branches: master Link: http://git.php.net/?p=web/master.git;a=commitdiff;h=9cb5a2073ba3175e0e94fffa09d4dd1c7c2c7981 Log: Remove a few more references to www.php.net and replace them with php.net. Changed paths: M entry/user-note.php M fetch/index.php M fetch/user-notes-rss.php M index.php M manage/user-notes.php M scripts/index.php M scripts/mirror-test M scripts/pregen_news M scripts/rss_parser Diff: diff --git a/entry/user-note.php b/entry/user-note.php index 6ce955c..7a4afd2 100644 --- a/entry/user-note.php +++ b/entry/user-note.php @@ -137,7 +137,7 @@ if (@mysql_query($query)) { // $msg .= $spam_data; // $msg .= "\n----\n"; - $msg .= "Manual Page -- http://www.php.net/manual/en/$sect.php\n"; + $msg .= "Manual Page -- http://php.net/manual/en/$sect.php\n"; $msg .= "Edit -- https://master.php.net/note/edit/$new_id\n"; //$msg .= "Approve -- https://master.php.net/manage/user-notes.php?action=approve+$new_id&report=yes\n"; foreach ($note_del_reasons AS $reason) { diff --git a/fetch/index.php b/fetch/index.php index 133bb50..3a62c99 100644 --- a/fetch/index.php +++ b/fetch/index.php @@ -1,3 +1,3 @@ <?php -header("Location: http://www.php.net/"); +header("Location: http://php.net/"); ?> diff --git a/fetch/user-notes-rss.php b/fetch/user-notes-rss.php index 436f89e..5894a69 100644 --- a/fetch/user-notes-rss.php +++ b/fetch/user-notes-rss.php @@ -46,7 +46,7 @@ header('Content-type: text/xml'); xmlns="http://purl.org/rss/1.0/" xmlns:dc="http://purl.org/dc/elements/1.1/" > - <channel rdf:about="http://www.php.net/"> + <channel rdf:about="http://php.net/"> <title>PHP Manual User Notes</title> <link>https://master.php.net/manage/user-notes.php</link> <description/> @@ -60,9 +60,9 @@ header('Content-type: text/xml'); <?php } ?> </items> </channel> - <image rdf:about="http://www.php..net/images/php.gif"> + <image rdf:about="http://php.net/images/php.gif"> <title>PHP Manual User Notes</title> - <url>http://www.php.net/images/php.gif</url> + <url>http://php.net/images/php.gif</url> <link>https://master.php.net/manage/user-notes.php</link> </image> <?php diff --git a/index.php b/index.php index 133bb50..3a62c99 100644 --- a/index.php +++ b/index.php @@ -1,3 +1,3 @@ <?php -header("Location: http://www.php.net/"); +header("Location: http://php.net/"); ?> diff --git a/manage/user-notes.php b/manage/user-notes.php index ce01666..ed349d0 100644 --- a/manage/user-notes.php +++ b/manage/user-notes.php @@ -97,7 +97,7 @@ if (!$action) { "<br /><span class=\"author\">",date("d-M-Y h:i",$row['ts'])," ", hscr($row['user']),"</span><br />", "Note id: $id<br />\n", - "<a href=\"http://www.php.net/manual/en/{$row['sect']}.php\" target=\"_blank\">http://www.php.net/manual/en/{$row['sect']}.php</a><br />\n", + "<a href=\"http://php.net/manual/en/{$row['sect']}.php\" target=\"_blank\">http://php.net/manual/en/{$row['sect']}.php</a><br />\n", "<a href=\"https://master.php.net/note/edit/$id\" target=\"_blank\">Edit Note</a><br />"; foreach ($note_del_reasons AS $reason => $text) { echo '<a href="https://master.php.net/note/delete/', $id, '/', urlencode($reason), '" target=\"_blank\">', 'Delete Note: ', hscr($text), "</a><br />\n"; diff --git a/scripts/index.php b/scripts/index.php index 133bb50..3a62c99 100644 --- a/scripts/index.php +++ b/scripts/index.php @@ -1,3 +1,3 @@ <?php -header("Location: http://www.php.net/"); +header("Location: http://php.net/"); ?> diff --git a/scripts/mirror-test b/scripts/mirror-test index 54f583b..67e9b7d 100755 --- a/scripts/mirror-test +++ b/scripts/mirror-test @@ -151,7 +151,7 @@ foreach ($hosts as $index => $host) { // shortcut requests to a mirror site, and we would not handle // that properly. Otherwise on a mirror site we need to check // the shortcut functionality too. - $filename = ($host['hostname'] == 'www.php.net') ? '/mirror-info.php' : '/mirror-info'; + $filename = ($host['hostname'] == 'www.php.net' || $host['hostname'] == 'php.net') ? '/mirror-info.php' : '/mirror-info'; // ------------------------------------------------------------------------- // First HTTP request for the mirror-info file diff --git a/scripts/pregen_news b/scripts/pregen_news index a1f39ea..3369e81 100644 --- a/scripts/pregen_news +++ b/scripts/pregen_news @@ -200,8 +200,8 @@ function legacy_rss($atom, $newsDest, $confDest) { $NEWS_ITEMS .= $item; } } - GenerateRSSHeader($links["conf"], $CONF, "http://www.php.net/conferences/"); - GenerateRSSHeader($links["news"], $NEWS, "http://www.php.net/"); + GenerateRSSHeader($links["conf"], $CONF, "http://php.net/conferences/"); + GenerateRSSHeader($links["news"], $NEWS, "http://php.net/"); $CONF .= $CONF_ITEMS; $NEWS .= $NEWS_ITEMS; diff --git a/scripts/rss_parser b/scripts/rss_parser index 003e2cc..8b80abe 100644 --- a/scripts/rss_parser +++ b/scripts/rss_parser @@ -231,7 +231,7 @@ GenerateRSSFooter($RSS); return $RSS; } -#$RSSNews = GenerateRSSFile($root, "http://www.php.net/"); -#$RSSConf = GenerateRSSFile("$root/conferences", "http://www.php.net/conferences/"); +#$RSSNews = GenerateRSSFile($root, "http://php.net/"); +#$RSSConf = GenerateRSSFile("$root/conferences", "http://php.net/conferences/"); ?>