Browse Source

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)

Signed-off-by: Roland Häder <roland@mxchange.org>
pull/3010/head
Roland Häder 4 years ago
parent
commit
378cbd9027
3 changed files with 7 additions and 7 deletions
  1. +2
    -4
      include/socgraph.php
  2. +4
    -2
      mod/fetch.php
  3. +1
    -1
      mod/p.php

+ 2
- 4
include/socgraph.php View File

@ -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);


+ 4
- 2
mod/fetch.php View File

@ -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");


+ 1
- 1
mod/p.php View File

@ -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");


Loading…
Cancel
Save