From 8e1796bb1f5e85efb58481a29c333445f7b83d95 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Roland=20H=C3=A4der?= Date: Thu, 15 Dec 2016 09:57:55 +0100 Subject: [PATCH] Continued with #3010: - more reverts of $a->get_baseurl() - you always do: function foo (&$a), please read my TODO why it is not so good. - for now I have fixed this inconsistency (compared to other method signatures) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Roland Häder --- include/socgraph.php | 6 ++---- mod/fetch.php | 6 ++++-- mod/p.php | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/include/socgraph.php b/include/socgraph.php index c7f0c7091a..349fd0b2ca 100644 --- a/include/socgraph.php +++ b/include/socgraph.php @@ -1728,8 +1728,6 @@ function update_gcontact_from_probe($url) { * @param int $uid User ID */ function update_gcontact_for_user($uid) { - $a = get_app(); - $r = q("SELECT `profile`.`locality`, `profile`.`region`, `profile`.`country-name`, `profile`.`name`, `profile`.`about`, `profile`.`gender`, `profile`.`pub_keywords`, `profile`.`dob`, `profile`.`photo`, @@ -1746,7 +1744,7 @@ function update_gcontact_for_user($uid) { // The "addr" field was added in 3.4.3 so it can be empty for older users if ($r[0]["addr"] != "") - $addr = $r[0]["nickname"].'@'.str_replace(array("http://", "https://"), "", $a->get_baseurl()); + $addr = $r[0]["nickname"].'@'.str_replace(array("http://", "https://"), "", App::get_baseurl()); else $addr = $r[0]["addr"]; @@ -1756,7 +1754,7 @@ function update_gcontact_for_user($uid) { "notify" => $r[0]["notify"], "url" => $r[0]["url"], "hide" => ($r[0]["hidewall"] OR !$r[0]["net-publish"]), "nick" => $r[0]["nickname"], "addr" => $addr, - "connect" => $addr, "server_url" => $a->get_baseurl(), + "connect" => $addr, "server_url" => App::get_baseurl(), "generation" => 1, "network" => NETWORK_DFRN); update_gcontact($gcontact); diff --git a/mod/fetch.php b/mod/fetch.php index 6e4c7bb16e..04bdf51880 100644 --- a/mod/fetch.php +++ b/mod/fetch.php @@ -6,7 +6,9 @@ require_once("include/crypto.php"); require_once("include/diaspora.php"); require_once("include/xml.php"); -function fetch_init($a){ +/// @TODO You always make it like this: function foo(&$a) +/// @TODO This means that the value of $a can be changed in anything, remove & and use App as type-hint +function fetch_init(&$a){ if (($a->argc != 3) OR (!in_array($a->argv[1], array("post", "status_message", "reshare")))) { header($_SERVER["SERVER_PROTOCOL"].' 404 '.t('Not Found')); @@ -27,7 +29,7 @@ function fetch_init($a){ $parts = parse_url($r[0]["author-link"]); $host = $parts["scheme"]."://".$parts["host"]; - if (normalise_link($host) != normalise_link($a->get_baseurl())) { + if (normalise_link($host) != normalise_link(App::get_baseurl())) { $location = $host."/fetch/".$a->argv[1]."/".urlencode($guid); header("HTTP/1.1 301 Moved Permanently"); diff --git a/mod/p.php b/mod/p.php index f456a09c64..4db8f55296 100644 --- a/mod/p.php +++ b/mod/p.php @@ -31,7 +31,7 @@ function p_init($a){ $parts = parse_url($r[0]["author-link"]); $host = $parts["scheme"]."://".$parts["host"]; - if (normalise_link($host) != normalise_link($a->get_baseurl())) { + if (normalise_link($host) != normalise_link(App::get_baseurl())) { $location = $host."/p/".urlencode($guid).".xml"; header("HTTP/1.1 301 Moved Permanently");