[git] web/master.git branch master updated. aaea42a2b3752757d83ffc1adbec0a9927a26b9f

The branch, master on web/master.git has been updated via aaea42a2b3752757d83ffc1adbec0a9927a26b9f (commit) from 5e2d4c0aa400cc7d03be4f3b0c965af0ad080342 (commit) Summary of changes: entry/event.php | 6 +++--- entry/svn-account.php | 6 +++--- entry/user-note.php | 12 ++++++------ fetch/cvsauth.php | 2 +- fetch/user-notes-rss.php | 10 +++++----- forgot.php | 2 +- include/login.inc | 4 ++-- manage/user-notes.php | 8 ++++---- scripts/event-weekly-email | 2 +- scripts/update-backend | 6 +++--- scripts/update-user-notes | 2 +- 11 files changed, 30 insertions(+), 30 deletions(-) -- Log ---------------------------------------- commit aaea42a2b3752757d83ffc1adbec0a9927a26b9f Author: Rasmus Lerdorf <rasmus@php.net> Date: Sat Jan 21 18:42:35 2012 -0800 Remove transitional master2 name diff --git a/entry/event.php b/entry/event.php index 311f97b..2dbcc9f 100644 --- a/entry/event.php +++ b/entry/event.php @@ -107,6 +107,6 @@ $msg .= "Country: ".stripslashes($country)."\n" # add signature/actions $msg .= "\n-- \n" - . "https://master2.php.net/manage/event.php?id=$new_id&action=approve\n" - . "https://master2.php.net/manage/event.php?id=$new_id&action=reject\n" - . "https://master2.php.net/manage/event.php?id=$new_id\n"; + . "https://master.php.net/manage/event.php?id=$new_id&action=approve\n" + . "https://master.php.net/manage/event.php?id=$new_id&action=reject\n" + . "https://master.php.net/manage/event.php?id=$new_id\n"; diff --git a/entry/svn-account.php b/entry/svn-account.php index 26104e0..f1cf50d 100644 --- a/entry/svn-account.php +++ b/entry/svn-account.php @@ -97,9 +97,9 @@ if (@mysql_query($query)) { } $msg .= "\n-- \n"; - $msg .= "approve: https://master2.php.net/manage/users.php?action=approve&id=$new_id\n"; - $msg .= "reject: https://master2.php.net/manage/users.php?action=remove&id=$new_id\n"; - $msg .= "view: https://master2.php.net/manage/users.php?id=$new_id\n"; + $msg .= "approve: https://master.php.net/manage/users.php?action=approve&id=$new_id\n"; + $msg .= "reject: https://master.php.net/manage/users.php?action=remove&id=$new_id\n"; + $msg .= "view: https://master.php.net/manage/users.php?id=$new_id\n"; mail($failto,"SVN Account Request: $username",$msg,"From: $from\r\nMessage-ID: <cvs-account-$new_id-admin@php.net>", "-fnoreply@php.net"); } else { diff --git a/entry/user-note.php b/entry/user-note.php index 0fedf2e..6ce955c 100644 --- a/entry/user-note.php +++ b/entry/user-note.php @@ -138,16 +138,16 @@ if (@mysql_query($query)) { // $msg .= "\n----\n"; $msg .= "Manual Page -- http://www.php.net/manual/en/$sect.php\n"; - $msg .= "Edit -- https://master2.php.net/note/edit/$new_id\n"; - //$msg .= "Approve -- https://master2.php.net/manage/user-notes.php?action=approve+$new_id&report=yes\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) { $msg .= "Del: " . str_pad($reason, $note_del_reasons_pad) - . "-- https://master2.php.net/note/delete/$new_id/" . urlencode($reason) ."\n"; + . "-- https://master.php.net/note/delete/$new_id/" . urlencode($reason) ."\n"; } - $msg .= str_pad('Del: other reasons', $note_del_reasons_pad) . "-- https://master2.php.net/note/delete/$new_id\n"; - $msg .= "Reject -- https://master2.php.net/note/reject/$new_id\n"; - $msg .= "Search -- https://master2.php.net/manage/user-notes.php\n"; + $msg .= str_pad('Del: other reasons', $note_del_reasons_pad) . "-- https://master.php.net/note/delete/$new_id\n"; + $msg .= "Reject -- https://master.php.net/note/reject/$new_id\n"; + $msg .= "Search -- https://master.php.net/manage/user-notes.php\n"; # make sure we have a return address. if (!$user) $user = "php-general@lists.php.net"; # strip spaces in email address, or will get a bad To: field diff --git a/fetch/cvsauth.php b/fetch/cvsauth.php index 69ad517..c6911ec 100644 --- a/fetch/cvsauth.php +++ b/fetch/cvsauth.php @@ -18,7 +18,7 @@ $opts = array( $ctx = stream_context_create(array("http" => $opts)); -$s = file_get_contents("https://master2.php.net/fetch/cvsauth.php", false, $ctx); +$s = file_get_contents("https://master.php.net/fetch/cvsauth.php", false, $ctx); $a = @unserialize($s); if (!is_array($a)) { diff --git a/fetch/user-notes-rss.php b/fetch/user-notes-rss.php index 29ec96b..436f89e 100644 --- a/fetch/user-notes-rss.php +++ b/fetch/user-notes-rss.php @@ -48,13 +48,13 @@ header('Content-type: text/xml'); > <channel rdf:about="http://www.php.net/"> <title>PHP Manual User Notes</title> - <link>https://master2.php.net/manage/user-notes.php</link> + <link>https://master.php.net/manage/user-notes.php</link> <description/> <items> <?php if ($notes) { ?> <rdf:Seq> - <rdf:li rdf:resource="https://master2.php.net/note/edit/<?php - echo implode('"/> <rdf:li rdf:resource="https://master2.php.net/note/edit/', + <rdf:li rdf:resource="https://master.php.net/note/edit/<?php + echo implode('"/> <rdf:li rdf:resource="https://master.php.net/note/edit/', array_keys($notes));?>"/> </rdf:Seq> <?php } ?> @@ -63,7 +63,7 @@ header('Content-type: text/xml'); <image rdf:about="http://www.php.net/images/php.gif"> <title>PHP Manual User Notes</title> <url>http://www.php.net/images/php.gif</url> - <link>https://master2.php.net/manage/user-notes.php</link> + <link>https://master.php.net/manage/user-notes.php</link> </image> <?php foreach ($notes as $note) { @@ -71,7 +71,7 @@ foreach ($notes as $note) { <item> <title><?php echo htmlspecialchars(substr($note['note'], 0, 40)); echo strlen($note['note']) < 40 ? '...' : ''; ?></title> - <link>https://master2.php.net/note/edit/<?php echo $note['id']; ?></link> + <link>https://master.php.net/note/edit/<?php echo $note['id']; ?></link> <description> <![CDATA[ <?php echo htmlspecialchars($note['note']); ?> diff --git a/forgot.php b/forgot.php index f9ee0cb..9814423 100644 --- a/forgot.php +++ b/forgot.php @@ -78,7 +78,7 @@ be safe.) To change your password, simply use the URL below and choose a new password. - https://master2.php.net/forgot.php?id=$row[userid]&key=$newpass + https://master.php.net/forgot.php?id=$row[userid]&key=$newpass Let us know if you have any further problems. -- diff --git a/include/login.inc b/include/login.inc index 9cada81..65bdfa6 100644 --- a/include/login.inc +++ b/include/login.inc @@ -22,9 +22,9 @@ if (!$user || !$pw || !verify_password($user,$pw)) { if (!isset($_SERVER["HTTPS"]) || $_SERVER["HTTPS"] != "on") { $name = basename($_SERVER["SCRIPT_NAME"]); if ($name === 'login.php') { - header("Location: https://master2.php.net/" . $name); + header("Location: https://master.php.net/" . $name); } else { - header("Location: https://master2.php.net/manage/" . $name); + header("Location: https://master.php.net/manage/" . $name); } exit; } diff --git a/manage/user-notes.php b/manage/user-notes.php index c0ad731..3661072 100644 --- a/manage/user-notes.php +++ b/manage/user-notes.php @@ -98,12 +98,12 @@ if (!$action) { 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=\"https://master2.php.net/note/edit/$id\" target=\"_blank\">Edit Note</a><br />"; + "<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://master2.php.net/note/delete/', $id, '/', urlencode($reason), '" target=\"_blank\">', 'Delete Note: ', hscr($text), "</a><br />\n"; + echo '<a href="https://master.php.net/note/delete/', $id, '/', urlencode($reason), '" target=\"_blank\">', 'Delete Note: ', hscr($text), "</a><br />\n"; } - echo "<a href=\"https://master2.php.net/note/delete/$id\" target=\"_blank\">Delete Note: other reason</a><br />", - "<a href=\"https://master2.php.net/note/reject/$id\" target=\"_blank\">Reject Note</a>", + echo "<a href=\"https://master.php.net/note/delete/$id\" target=\"_blank\">Delete Note: other reason</a><br />", + "<a href=\"https://master.php.net/note/reject/$id\" target=\"_blank\">Reject Note</a>", "</p>", "<hr />"; } diff --git a/scripts/event-weekly-email b/scripts/event-weekly-email index 6c7f74c..b32896b 100755 --- a/scripts/event-weekly-email +++ b/scripts/event-weekly-email @@ -18,7 +18,7 @@ Greetings PHP Webmasters; There are roughly [$count] unapproved events awaiting moderation. Please check the queue: - https://master2.php.net/manage/event.php?unapproved=1 + https://master.php.net/manage/event.php?unapproved=1 Thanks!"; diff --git a/scripts/update-backend b/scripts/update-backend index c843965..0c5f1f9 100755 --- a/scripts/update-backend +++ b/scripts/update-backend @@ -17,16 +17,16 @@ $root = $argv[1]; set_time_limit(30 * 60); // Get list of mirror sites -fetch_into_file("http://master2.php.net/fetch/mirrors.php?token=$token", +fetch_into_file("http://master.php.net/fetch/mirrors.php?token=$token", "$root/include/mirrors.inc"); // Get list of countries -fetch_into_file("http://master2.php.net/fetch/countries.php?token=$token", +fetch_into_file("http://master.php.net/fetch/countries.php?token=$token", "$root/include/countries.inc"); // Get list of upcoming events -fetch_into_file("http://master2.php.net/fetch/events.php?token=$token", +fetch_into_file("http://master.php.net/fetch/events.php?token=$token", "$root/backend/events.csv"); // Pregenerate event listing sidebar for homepage diff --git a/scripts/update-user-notes b/scripts/update-user-notes index a5258d7..6559f16 100755 --- a/scripts/update-user-notes +++ b/scripts/update-user-notes @@ -22,7 +22,7 @@ $since = $argv[2]; /* get user notes */ $fp = @fopen( - "http://master2.php.net/fetch/user-notes.php?token=$token".($since?"&since=$since":""), + "http://master.php.net/fetch/user-notes.php?token=$token".($since?"&since=$since":""), "r" ); if (!$fp) { Thank you for your contribution.