[web-people] master: Use main.php.net instead of master.php.net

Author: Nikita Popov (nikic) Date: 2021-04-06T15:28:27+02:00 Commit: https://github.com/php/web-people/commit/5c3ee818f9dcccfbfd96bb1a26834de5865e7a14 Raw diff: https://github.com/php/web-people/commit/5c3ee818f9dcccfbfd96bb1a26834de5865e7a14.diff Use main.php.net instead of master.php.net Changed paths: M include/layout.php M include/misc.php M js/search.js M js/userlisting.php M user.php Diff: diff --git a/include/layout.php b/include/layout.php index 6f7ae04..1811b6c 100644 --- a/include/layout.php +++ b/include/layout.php @@ -3,7 +3,7 @@ function site_header($TITLE) { $SUBDOMAIN = "people"; $LINKS = array( - array("href" => "https://master.php.net/manage/users.php", "text" => "Master"), + array("href" => "https://main.php.net/manage/users.php", "text" => "Manage"), array("href" => "https://wiki.php.net/web/people", "text" => "Help"), ); $CSS[] = "/styles/user-autocomplete.css"; diff --git a/include/misc.php b/include/misc.php index db57b81..3fda481 100644 --- a/include/misc.php +++ b/include/misc.php @@ -22,11 +22,11 @@ function findAllUsers($page) { if (!$token) { $token = trim(file_get_contents("token")); } - $url = "https://master.php.net/fetch/allusers.php?token=" . rawurlencode($token); + $url = "https://main.php.net/fetch/allusers.php?token=" . rawurlencode($token); $retval = cached($url, false, $ctx); $json = json_decode($retval, true); if (!is_array($json)) { - error("Something happened to master"); + error("Something happened to main"); } if (isset($json["error"])) { error($json["error"]); @@ -47,11 +47,11 @@ function findPHPUser($username) if (!$token) { $token = trim(file_get_contents("token")); } - $url = "https://master.php.net/fetch/allusers.php?token=" . rawurlencode($token); + $url = "https://main.php.net/fetch/allusers.php?token=" . rawurlencode($token); $retval = cached($url, false, $ctx); $json = json_decode($retval, true); if (!is_array($json)) { - error("Something happend to master"); + error("Something happend to main"); } if (isset($json["error"])) { error($json["error"]); @@ -90,7 +90,7 @@ function findPHPUserProfile($username) if (!$token) { $token = trim(file_get_contents("token")); } - $retval = cached("https://master.php.net/fetch/user-profile.php?username=" . $username . "&token=" . rawurlencode($token), false, $ctx); + $retval = cached("https://main.php.net/fetch/user-profile.php?username=" . $username . "&token=" . rawurlencode($token), false, $ctx); if (!$retval) { $error = error_get_last(); // Remove the function name, arguments and all that stuff... we @@ -101,7 +101,7 @@ function findPHPUserProfile($username) } $json = json_decode($retval, true); if (!is_array($json)) { - error("Something happend to master"); + error("Something happend to main"); } if (isset($json["error"])) { error($json["error"]); diff --git a/js/search.js b/js/search.js index 3c8afcf..c266c05 100644 --- a/js/search.js +++ b/js/search.js @@ -13,7 +13,7 @@ $(document).ready(function() { maxHeight:400, fnFormatResult: fnFormatSearchResult, onSelect: function(value, data){ - if (window.location.host == 'master.php.net') { + if (window.location.host == 'main.php.net') { window.location = "/manage/users.php?username=" + users[value]["username"]; } else { window.location = "/" + users[value]["username"]; diff --git a/js/userlisting.php b/js/userlisting.php index 4f322df..bb42b94 100644 --- a/js/userlisting.php +++ b/js/userlisting.php @@ -7,7 +7,7 @@ function getAllUsers() { if (!$token) { $token = trim(file_get_contents("../token")); } - $retval = file_get_contents("https://master.php.net/fetch/allusers.php?&token=" . rawurlencode($token), false, $ctx); + $retval = file_get_contents("https://main.php.net/fetch/allusers.php?&token=" . rawurlencode($token), false, $ctx); if (!$retval) { return; } diff --git a/user.php b/user.php index d893ce6..aba5bef 100644 --- a/user.php +++ b/user.php @@ -14,7 +14,7 @@ $gravatar = "//www.gravatar.com/avatar/" . md5($email) . ".jpg?s=460"; $bugs_url = "https://bugs.php.net/search.php?cmd=display&order_by=ts2&direction=DESC&status=Open&assign=" . urlencode($USERNAME); -$master_url = "https://master.php.net/manage/users.php?username=" . urlencode($USERNAME); +$main_url = "https://main.php.net/manage/users.php?username=" . urlencode($USERNAME); ?> <section class="mainscreen"> <div class="profile-main"> @@ -80,7 +80,7 @@ <?php } ?> <li> <span class="icon-edit"></span> - <a href="<?php echo $master_url ?>">edit on master</a> + <a href="<?php echo $main_url ?>">edit on main</a> </li> </ul> </div>