From 41db906dc402ed94521a8b1fde088107c201f20b Mon Sep 17 00:00:00 2001 From: =?utf8?q?Roland=20H=C3=A4der?= Date: Wed, 14 Dec 2016 16:59:35 +0100 Subject: [PATCH] Continued with #3010: - removed added debug messages (maybe they will come back in accordance to code-style guidelines?) - converted $a->get_baseurl() back to App::get_baseurl() - reverted back other code I have touched/merged as this was double: (substr($url, 0, 4) !== 'http') on $url = 'https://bla'; will be FALSE (means found http at start), too. MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Signed-off-by: Roland Häder --- include/api.php | 18 +++++++++--------- include/dfrn.php | 8 +++----- include/enotify.php | 2 +- include/event.php | 2 +- include/network.php | 13 ++----------- 5 files changed, 16 insertions(+), 27 deletions(-) diff --git a/include/api.php b/include/api.php index 1ec6576202..757954ed04 100644 --- a/include/api.php +++ b/include/api.php @@ -693,7 +693,7 @@ 'follow_request_sent' => false, 'statusnet_blocking' => false, 'notifications' => false, - //'statusnet_profile_url' => $a->get_baseurl()."/contacts/".$uinfo[0]['cid'], + //'statusnet_profile_url' => App::get_baseurl()."/contacts/".$uinfo[0]['cid'], 'statusnet_profile_url' => $uinfo[0]['url'], 'uid' => intval($uinfo[0]['uid']), 'cid' => intval($uinfo[0]['cid']), @@ -1078,8 +1078,8 @@ if ($r) { $phototypes = Photo::supportedTypes(); $ext = $phototypes[$r[0]['type']]; - $_REQUEST['body'] .= "\n\n".'[url='.$a->get_baseurl().'/photos/'.$r[0]['nickname'].'/image/'.$r[0]['resource-id'].']'; - $_REQUEST['body'] .= '[img]'.$a->get_baseurl()."/photo/".$r[0]['resource-id']."-".$r[0]['scale'].".".$ext."[/img][/url]"; + $_REQUEST['body'] .= "\n\n".'[url='.App::get_baseurl().'/photos/'.$r[0]['nickname'].'/image/'.$r[0]['resource-id'].']'; + $_REQUEST['body'] .= '[img]'.App::get_baseurl()."/photo/".$r[0]['resource-id']."-".$r[0]['scale'].".".$ext."[/img][/url]"; } } @@ -2302,7 +2302,7 @@ $text = preg_replace_callback( "|data:image/([^;]+)[^=]+=*|m", function($match) use ($item) { - return $a->get_baseurl()."/display/".$item['guid']; + return App::get_baseurl()."/display/".$item['guid']; }, $text); return $text; @@ -2690,7 +2690,7 @@ $name = $a->config['sitename']; $server = $a->get_hostname(); - $logo = $a->get_baseurl() . '/images/friendica-64.png'; + $logo = App::get_baseurl() . '/images/friendica-64.png'; $email = $a->config['admin_email']; $closed = (($a->config['register_policy'] == REGISTER_CLOSED) ? 'true' : 'false'); $private = (($a->config['system']['block_public']) ? 'true' : 'false'); @@ -2698,7 +2698,7 @@ if($a->config['api_import_size']) $texlimit = string($a->config['api_import_size']); $ssl = (($a->config['system']['have_ssl']) ? 'true' : 'false'); - $sslserver = (($ssl === 'true') ? str_replace('http:','https:',$a->get_baseurl()) : ''); + $sslserver = (($ssl === 'true') ? str_replace('http:','https:',App::get_baseurl()) : ''); $config = array( 'site' => array('name' => $name,'server' => $server, 'theme' => 'default', 'path' => '', @@ -3075,7 +3075,7 @@ $photo['album'] = $rr['album']; $photo['filename'] = $rr['filename']; $photo['type'] = $rr['type']; - $thumb = $a->get_baseurl()."/photo/".$rr['resource-id']."-".$rr['scale'].".".$typetoext[$rr['type']]; + $thumb = App::get_baseurl()."/photo/".$rr['resource-id']."-".$rr['scale'].".".$typetoext[$rr['type']]; if ($type == "xml") $data['photo'][] = array("@attributes" => $photo, "1" => $thumb); @@ -3124,11 +3124,11 @@ for ($k=intval($data['photo']['minscale']); $k<=intval($data['photo']['maxscale']); $k++) $data['photo']['links'][$k.":link"]["@attributes"] = array("type" => $data['photo']['type'], "scale" => $k, - "href" => $a->get_baseurl()."/photo/".$data['photo']['resource-id']."-".$k.".".$typetoext[$data['photo']['type']]); + "href" => App::get_baseurl()."/photo/".$data['photo']['resource-id']."-".$k.".".$typetoext[$data['photo']['type']]); } else { $data['photo']['link'] = array(); for ($k=intval($data['photo']['minscale']); $k<=intval($data['photo']['maxscale']); $k++) { - $data['photo']['link'][$k] = $a->get_baseurl()."/photo/".$data['photo']['resource-id']."-".$k.".".$typetoext[$data['photo']['type']]; + $data['photo']['link'][$k] = App::get_baseurl()."/photo/".$data['photo']['resource-id']."-".$k.".".$typetoext[$data['photo']['type']]; } } unset($data['photo']['resource-id']); diff --git a/include/dfrn.php b/include/dfrn.php index 3a8bf1224e..6451b8521b 100644 --- a/include/dfrn.php +++ b/include/dfrn.php @@ -1525,7 +1525,7 @@ class dfrn { "to_email" => $importer["email"], "uid" => $importer["importer_uid"], "item" => $suggest, - "link" => $a->get_baseurl()."/notifications/intros", + "link" => App::get_baseurl()."/notifications/intros", "source_name" => $importer["name"], "source_link" => $importer["url"], "source_photo" => $importer["photo"], @@ -1792,8 +1792,6 @@ class dfrn { * @param int $posted_id The record number of item record that was just posted */ private function do_poke($item, $importer, $posted_id) { - $a = get_app(); - $verb = urldecode(substr($item["verb"],strpos($item["verb"], "#")+1)); if(!$verb) return; @@ -1813,7 +1811,7 @@ class dfrn { } } - if($Blink && link_compare($Blink,$a->get_baseurl()."/profile/".$importer["nickname"])) { + if($Blink && link_compare($Blink,App::get_baseurl()."/profile/".$importer["nickname"])) { // send a notification notification(array( @@ -1824,7 +1822,7 @@ class dfrn { "to_email" => $importer["email"], "uid" => $importer["importer_uid"], "item" => $item, - "link" => $a->get_baseurl()."/display/".urlencode(get_item_guid($posted_id)), + "link" => App::get_baseurl()."/display/".urlencode(get_item_guid($posted_id)), "source_name" => stripslashes($item["author-name"]), "source_link" => $item["author-link"], "source_photo" => ((link_compare($item["author-link"],$importer["url"])) diff --git a/include/enotify.php b/include/enotify.php index aa736492f8..c6e0506e96 100644 --- a/include/enotify.php +++ b/include/enotify.php @@ -721,7 +721,7 @@ function check_item_notification($itemid, $uid, $defaulttype = "") { $params["to_email"] = $user[0]["email"]; $params["item"] = $item[0]; $params["parent"] = $item[0]["parent"]; - $params["link"] = $a->get_baseurl().'/display/'.urlencode($item[0]["guid"]); + $params["link"] = App::get_baseurl().'/display/'.urlencode($item[0]["guid"]); $params["otype"] = 'item'; $params["source_name"] = $item[0]["author-name"]; $params["source_link"] = $item[0]["author-link"]; diff --git a/include/event.php b/include/event.php index 6a292a2c07..3a41dad4e7 100644 --- a/include/event.php +++ b/include/event.php @@ -590,7 +590,7 @@ function process_events ($arr) { $is_first = ($d !== $last_date); $last_date = $d; - $edit = ((! $rr['cid']) ? array($a->get_baseurl().'/events/event/'.$rr['id'],t('Edit event'),'','') : null); + $edit = ((! $rr['cid']) ? array(App::get_baseurl().'/events/event/'.$rr['id'],t('Edit event'),'','') : null); $title = strip_tags(html_entity_decode(bbcode($rr['summary']),ENT_QUOTES,'UTF-8')); if(! $title) { list($title, $_trash) = explode("