kopia lustrzana https://github.com/friendica/friendica
commit
94f6f12ba3
30
boot.php
30
boot.php
|
@ -21,6 +21,7 @@
|
|||
require_once(__DIR__ . DIRECTORY_SEPARATOR . 'vendor' . DIRECTORY_SEPARATOR . 'autoload.php');
|
||||
|
||||
use Friendica\App;
|
||||
use Friendica\Core\System;
|
||||
use Friendica\Core\Config;
|
||||
use Friendica\Util\Lock;
|
||||
|
||||
|
@ -551,31 +552,16 @@ function system_unavailable() {
|
|||
killme();
|
||||
}
|
||||
|
||||
function clean_urls() {
|
||||
$a = get_app();
|
||||
return true;
|
||||
}
|
||||
|
||||
function z_path() {
|
||||
$base = App::get_baseurl();
|
||||
|
||||
if (!clean_urls()) {
|
||||
$base .= '/?q=';
|
||||
}
|
||||
|
||||
return $base;
|
||||
}
|
||||
|
||||
/**
|
||||
* @brief Returns the baseurl.
|
||||
*
|
||||
* @see App::get_baseurl()
|
||||
* @see System::baseUrl()
|
||||
*
|
||||
* @return string
|
||||
* @TODO Maybe super-flous and deprecated? Seems to only wrap App::get_baseurl()
|
||||
* @TODO Function is deprecated and only used in some addons
|
||||
*/
|
||||
function z_root() {
|
||||
return App::get_baseurl();
|
||||
return System::baseUrl();
|
||||
}
|
||||
|
||||
/**
|
||||
|
@ -628,10 +614,10 @@ function check_url(App $a) {
|
|||
// We will only change the url to an ip address if there is no existing setting
|
||||
|
||||
if (!x($url)) {
|
||||
$url = set_config('system', 'url', App::get_baseurl());
|
||||
$url = set_config('system', 'url', System::baseUrl());
|
||||
}
|
||||
if ((!link_compare($url, App::get_baseurl())) && (!preg_match("/^(\d{1,3})\.(\d{1,3})\.(\d{1,3})\.(\d{1,3})$/", $a->get_hostname))) {
|
||||
$url = set_config('system', 'url', App::get_baseurl());
|
||||
if ((!link_compare($url, System::baseUrl())) && (!preg_match("/^(\d{1,3})\.(\d{1,3})\.(\d{1,3})\.(\d{1,3})$/", $a->get_hostname))) {
|
||||
$url = set_config('system', 'url', System::baseUrl());
|
||||
}
|
||||
|
||||
return;
|
||||
|
@ -913,7 +899,7 @@ function killme() {
|
|||
*/
|
||||
function goaway($s) {
|
||||
if (!strstr(normalise_link($s), "http://")) {
|
||||
$s = App::get_baseurl() . "/" . $s;
|
||||
$s = System::baseUrl() . "/" . $s;
|
||||
}
|
||||
|
||||
header("Location: $s");
|
||||
|
|
|
@ -1,6 +1,7 @@
|
|||
<?php
|
||||
|
||||
use Friendica\App;
|
||||
use Friendica\Core\System;
|
||||
use Friendica\Network\Probe;
|
||||
|
||||
// Included here for completeness, but this is a very dangerous operation.
|
||||
|
@ -33,7 +34,7 @@ function user_remove($uid) {
|
|||
if($uid == local_user()) {
|
||||
unset($_SESSION['authenticated']);
|
||||
unset($_SESSION['uid']);
|
||||
goaway(App::get_baseurl());
|
||||
goaway(System::baseUrl());
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -401,7 +402,7 @@ function contact_photo_menu($contact, $uid = 0)
|
|||
$sparkle = false;
|
||||
if ($contact['network'] === NETWORK_DFRN) {
|
||||
$sparkle = true;
|
||||
$profile_link = App::get_baseurl() . '/redir/' . $contact['id'];
|
||||
$profile_link = System::baseUrl() . '/redir/' . $contact['id'];
|
||||
} else {
|
||||
$profile_link = $contact['url'];
|
||||
}
|
||||
|
@ -417,17 +418,17 @@ function contact_photo_menu($contact, $uid = 0)
|
|||
}
|
||||
|
||||
if (in_array($contact['network'], array(NETWORK_DFRN, NETWORK_DIASPORA))) {
|
||||
$pm_url = App::get_baseurl() . '/message/new/' . $contact['id'];
|
||||
$pm_url = System::baseUrl() . '/message/new/' . $contact['id'];
|
||||
}
|
||||
|
||||
if ($contact['network'] == NETWORK_DFRN) {
|
||||
$poke_link = App::get_baseurl() . '/poke/?f=&c=' . $contact['id'];
|
||||
$poke_link = System::baseUrl() . '/poke/?f=&c=' . $contact['id'];
|
||||
}
|
||||
|
||||
$contact_url = App::get_baseurl() . '/contacts/' . $contact['id'];
|
||||
$contact_url = System::baseUrl() . '/contacts/' . $contact['id'];
|
||||
|
||||
$posts_link = App::get_baseurl() . '/contacts/' . $contact['id'] . '/posts';
|
||||
$contact_drop_link = App::get_baseurl() . '/contacts/' . $contact['id'] . '/drop?confirm=1';
|
||||
$posts_link = System::baseUrl() . '/contacts/' . $contact['id'] . '/posts';
|
||||
$contact_drop_link = System::baseUrl() . '/contacts/' . $contact['id'] . '/drop?confirm=1';
|
||||
|
||||
/**
|
||||
* menu array:
|
||||
|
|
|
@ -1,6 +1,7 @@
|
|||
<?php
|
||||
|
||||
use Friendica\App;
|
||||
use Friendica\Core\System;
|
||||
|
||||
/**
|
||||
* @file include/ForumManager.php
|
||||
|
@ -106,7 +107,7 @@ class ForumManager {
|
|||
'name' => $contact['name'],
|
||||
'cid' => $contact['id'],
|
||||
'selected' => $selected,
|
||||
'micro' => App::remove_baseurl(proxy_url($contact['micro'], false, PROXY_SIZE_MICRO)),
|
||||
'micro' => System::removedBaseUrl(proxy_url($contact['micro'], false, PROXY_SIZE_MICRO)),
|
||||
'id' => ++$id,
|
||||
);
|
||||
$entries[] = $entry;
|
||||
|
|
|
@ -5,6 +5,8 @@
|
|||
* or for formatting notifications
|
||||
*/
|
||||
|
||||
use Friendica\Core\System;
|
||||
|
||||
require_once 'include/html2plain.php';
|
||||
require_once 'include/probe.php';
|
||||
require_once 'include/datetime.php';
|
||||
|
@ -225,7 +227,7 @@ class NotificationsManager {
|
|||
switch ($ident) {
|
||||
case 'system':
|
||||
$default_item_label = 'notify';
|
||||
$default_item_link = $this->a->get_baseurl(true).'/notify/view/'. $it['id'];
|
||||
$default_item_link = System::baseUrl(true).'/notify/view/'. $it['id'];
|
||||
$default_item_image = proxy_url($it['photo'], false, PROXY_SIZE_MICRO);
|
||||
$default_item_url = $it['url'];
|
||||
$default_item_text = strip_tags(bbcode($it['msg']));
|
||||
|
@ -235,7 +237,7 @@ class NotificationsManager {
|
|||
|
||||
case 'home':
|
||||
$default_item_label = 'comment';
|
||||
$default_item_link = $this->a->get_baseurl(true).'/display/'.$it['pguid'];
|
||||
$default_item_link = System::baseUrl(true).'/display/'.$it['pguid'];
|
||||
$default_item_image = proxy_url($it['author-avatar'], false, PROXY_SIZE_MICRO);
|
||||
$default_item_url = $it['author-link'];
|
||||
$default_item_text = sprintf(t("%s commented on %s's post"), $it['author-name'], $it['pname']);
|
||||
|
@ -245,7 +247,7 @@ class NotificationsManager {
|
|||
|
||||
default:
|
||||
$default_item_label = (($it['id'] == $it['parent']) ? 'post' : 'comment');
|
||||
$default_item_link = $this->a->get_baseurl(true).'/display/'.$it['pguid'];
|
||||
$default_item_link = System::baseUrl(true).'/display/'.$it['pguid'];
|
||||
$default_item_image = proxy_url($it['author-avatar'], false, PROXY_SIZE_MICRO);
|
||||
$default_item_url = $it['author-link'];
|
||||
$default_item_text = (($it['id'] == $it['parent'])
|
||||
|
@ -261,7 +263,7 @@ class NotificationsManager {
|
|||
case ACTIVITY_LIKE:
|
||||
$notif = array(
|
||||
'label' => 'like',
|
||||
'link' => $this->a->get_baseurl(true).'/display/'.$it['pguid'],
|
||||
'link' => System::baseUrl(true).'/display/'.$it['pguid'],
|
||||
'image' => proxy_url($it['author-avatar'], false, PROXY_SIZE_MICRO),
|
||||
'url' => $it['author-link'],
|
||||
'text' => sprintf(t("%s liked %s's post"), $it['author-name'], $it['pname']),
|
||||
|
@ -274,7 +276,7 @@ class NotificationsManager {
|
|||
case ACTIVITY_DISLIKE:
|
||||
$notif = array(
|
||||
'label' => 'dislike',
|
||||
'link' => $this->a->get_baseurl(true).'/display/'.$it['pguid'],
|
||||
'link' => System::baseUrl(true).'/display/'.$it['pguid'],
|
||||
'image' => proxy_url($it['author-avatar'], false, PROXY_SIZE_MICRO),
|
||||
'url' => $it['author-link'],
|
||||
'text' => sprintf(t("%s disliked %s's post"), $it['author-name'], $it['pname']),
|
||||
|
@ -287,7 +289,7 @@ class NotificationsManager {
|
|||
case ACTIVITY_ATTEND:
|
||||
$notif = array(
|
||||
'label' => 'attend',
|
||||
'link' => $this->a->get_baseurl(true).'/display/'.$it['pguid'],
|
||||
'link' => System::baseUrl(true).'/display/'.$it['pguid'],
|
||||
'image' => proxy_url($it['author-avatar'], false, PROXY_SIZE_MICRO),
|
||||
'url' => $it['author-link'],
|
||||
'text' => sprintf(t("%s is attending %s's event"), $it['author-name'], $it['pname']),
|
||||
|
@ -300,7 +302,7 @@ class NotificationsManager {
|
|||
case ACTIVITY_ATTENDNO:
|
||||
$notif = array(
|
||||
'label' => 'attendno',
|
||||
'link' => $this->a->get_baseurl(true).'/display/'.$it['pguid'],
|
||||
'link' => System::baseUrl(true).'/display/'.$it['pguid'],
|
||||
'image' => proxy_url($it['author-avatar'], false, PROXY_SIZE_MICRO),
|
||||
'url' => $it['author-link'],
|
||||
'text' => sprintf( t("%s is not attending %s's event"), $it['author-name'], $it['pname']),
|
||||
|
@ -313,7 +315,7 @@ class NotificationsManager {
|
|||
case ACTIVITY_ATTENDMAYBE:
|
||||
$notif = array(
|
||||
'label' => 'attendmaybe',
|
||||
'link' => $this->a->get_baseurl(true).'/display/'.$it['pguid'],
|
||||
'link' => System::baseUrl(true).'/display/'.$it['pguid'],
|
||||
'image' => proxy_url($it['author-avatar'], false, PROXY_SIZE_MICRO),
|
||||
'url' => $it['author-link'],
|
||||
'text' => sprintf(t("%s may attend %s's event"), $it['author-name'], $it['pname']),
|
||||
|
@ -330,7 +332,7 @@ class NotificationsManager {
|
|||
|
||||
$notif = array(
|
||||
'label' => 'friend',
|
||||
'link' => $this->a->get_baseurl(true).'/display/'.$it['pguid'],
|
||||
'link' => System::baseUrl(true).'/display/'.$it['pguid'],
|
||||
'image' => proxy_url($it['author-avatar'], false, PROXY_SIZE_MICRO),
|
||||
'url' => $it['author-link'],
|
||||
'text' => sprintf(t("%s is now friends with %s"), $it['author-name'], $it['fname']),
|
||||
|
@ -508,7 +510,7 @@ class NotificationsManager {
|
|||
* @return string The additional sql query
|
||||
*/
|
||||
private function _personal_sql_extra() {
|
||||
$myurl = $this->a->get_baseurl(true) . '/profile/'. $this->a->user['nickname'];
|
||||
$myurl = System::baseUrl(true) . '/profile/'. $this->a->user['nickname'];
|
||||
$myurl = substr($myurl,strpos($myurl,'://')+3);
|
||||
$myurl = str_replace(array('www.','.'),array('','\\.'),$myurl);
|
||||
$diasp_url = str_replace('/profile/','/u/',$myurl);
|
||||
|
|
|
@ -5,6 +5,7 @@
|
|||
*/
|
||||
|
||||
use Friendica\App;
|
||||
use Friendica\Core\System;
|
||||
|
||||
require_once("include/photos.php");
|
||||
|
||||
|
@ -857,9 +858,9 @@ function import_profile_photo($photo, $uid, $cid, $quit_on_error = false) {
|
|||
|
||||
$suffix = '?ts='.time();
|
||||
|
||||
$photo = App::get_baseurl() . '/photo/' . $hash . '-4.' . $img->getExt() . $suffix;
|
||||
$thumb = App::get_baseurl() . '/photo/' . $hash . '-5.' . $img->getExt() . $suffix;
|
||||
$micro = App::get_baseurl() . '/photo/' . $hash . '-6.' . $img->getExt() . $suffix;
|
||||
$photo = System::baseUrl() . '/photo/' . $hash . '-4.' . $img->getExt() . $suffix;
|
||||
$thumb = System::baseUrl() . '/photo/' . $hash . '-5.' . $img->getExt() . $suffix;
|
||||
$micro = System::baseUrl() . '/photo/' . $hash . '-6.' . $img->getExt() . $suffix;
|
||||
|
||||
// Remove the cached photo
|
||||
$a = get_app();
|
||||
|
@ -888,9 +889,9 @@ function import_profile_photo($photo, $uid, $cid, $quit_on_error = false) {
|
|||
}
|
||||
|
||||
if ($photo_failure) {
|
||||
$photo = App::get_baseurl() . '/images/person-175.jpg';
|
||||
$thumb = App::get_baseurl() . '/images/person-80.jpg';
|
||||
$micro = App::get_baseurl() . '/images/person-48.jpg';
|
||||
$photo = System::baseUrl() . '/images/person-175.jpg';
|
||||
$thumb = System::baseUrl() . '/images/person-80.jpg';
|
||||
$micro = System::baseUrl() . '/images/person-48.jpg';
|
||||
}
|
||||
|
||||
return(array($photo,$thumb,$micro));
|
||||
|
@ -1079,18 +1080,18 @@ function store_photo(App $a, $uid, $imagedata = "", $url = "") {
|
|||
return(array());
|
||||
}
|
||||
|
||||
$image = array("page" => App::get_baseurl().'/photos/'.$page_owner_nick.'/image/'.$hash,
|
||||
"full" => App::get_baseurl()."/photo/{$hash}-0.".$ph->getExt());
|
||||
$image = array("page" => System::baseUrl().'/photos/'.$page_owner_nick.'/image/'.$hash,
|
||||
"full" => System::baseUrl()."/photo/{$hash}-0.".$ph->getExt());
|
||||
|
||||
if ($width > 800 || $height > 800) {
|
||||
$image["large"] = App::get_baseurl()."/photo/{$hash}-0.".$ph->getExt();
|
||||
$image["large"] = System::baseUrl()."/photo/{$hash}-0.".$ph->getExt();
|
||||
}
|
||||
|
||||
if ($width > 640 || $height > 640) {
|
||||
$ph->scaleImage(640);
|
||||
$r = $ph->store($uid, $visitor, $hash, $tempfile, t('Wall Photos'), 1, 0, $defperm);
|
||||
if ($r) {
|
||||
$image["medium"] = App::get_baseurl()."/photo/{$hash}-1.".$ph->getExt();
|
||||
$image["medium"] = System::baseUrl()."/photo/{$hash}-1.".$ph->getExt();
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -1098,7 +1099,7 @@ function store_photo(App $a, $uid, $imagedata = "", $url = "") {
|
|||
$ph->scaleImage(320);
|
||||
$r = $ph->store($uid, $visitor, $hash, $tempfile, t('Wall Photos'), 2, 0, $defperm);
|
||||
if ($r) {
|
||||
$image["small"] = App::get_baseurl()."/photo/{$hash}-2.".$ph->getExt();
|
||||
$image["small"] = System::baseUrl()."/photo/{$hash}-2.".$ph->getExt();
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -1123,7 +1124,7 @@ function store_photo(App $a, $uid, $imagedata = "", $url = "") {
|
|||
|
||||
$r = $ph->store($uid, $visitor, $hash, $tempfile, t('Wall Photos'), 3, 0, $defperm);
|
||||
if ($r) {
|
||||
$image["thumb"] = App::get_baseurl()."/photo/{$hash}-3.".$ph->getExt();
|
||||
$image["thumb"] = System::baseUrl()."/photo/{$hash}-3.".$ph->getExt();
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
@ -6,6 +6,7 @@
|
|||
*/
|
||||
|
||||
use Friendica\App;
|
||||
use Friendica\Core\System;
|
||||
|
||||
/**
|
||||
* This class contains functions to handle smiles
|
||||
|
@ -86,41 +87,41 @@ class Smilies {
|
|||
);
|
||||
|
||||
$icons = array(
|
||||
'<img class="smiley" src="' . App::get_baseurl() . '/images/smiley-heart.gif" alt="<3" title="<3" />',
|
||||
'<img class="smiley" src="' . App::get_baseurl() . '/images/smiley-brokenheart.gif" alt="</3" title="</3" />',
|
||||
'<img class="smiley" src="' . App::get_baseurl() . '/images/smiley-brokenheart.gif" alt="<\\3" title="<\\3" />',
|
||||
'<img class="smiley" src="' . App::get_baseurl() . '/images/smiley-smile.gif" alt=":-)" title=":-)" />',
|
||||
'<img class="smiley" src="' . App::get_baseurl() . '/images/smiley-wink.gif" alt=";-)" title=";-)" />',
|
||||
'<img class="smiley" src="' . App::get_baseurl() . '/images/smiley-frown.gif" alt=":-(" title=":-(" />',
|
||||
'<img class="smiley" src="' . App::get_baseurl() . '/images/smiley-tongue-out.gif" alt=":-P" title=":-P" />',
|
||||
'<img class="smiley" src="' . App::get_baseurl() . '/images/smiley-tongue-out.gif" alt=":-p" title=":-P" />',
|
||||
'<img class="smiley" src="' . App::get_baseurl() . '/images/smiley-kiss.gif" alt=":-\" title=":-\" />',
|
||||
'<img class="smiley" src="' . App::get_baseurl() . '/images/smiley-kiss.gif" alt=":-\" title=":-\" />',
|
||||
'<img class="smiley" src="' . App::get_baseurl() . '/images/smiley-kiss.gif" alt=":-x" title=":-x" />',
|
||||
'<img class="smiley" src="' . App::get_baseurl() . '/images/smiley-kiss.gif" alt=":-X" title=":-X" />',
|
||||
'<img class="smiley" src="' . App::get_baseurl() . '/images/smiley-laughing.gif" alt=":-D" title=":-D" />',
|
||||
'<img class="smiley" src="' . App::get_baseurl() . '/images/smiley-surprised.gif" alt="8-|" title="8-|" />',
|
||||
'<img class="smiley" src="' . App::get_baseurl() . '/images/smiley-surprised.gif" alt="8-O" title="8-O" />',
|
||||
'<img class="smiley" src="' . App::get_baseurl() . '/images/smiley-surprised.gif" alt=":-O" title="8-O" />',
|
||||
'<img class="smiley" src="' . App::get_baseurl() . '/images/smiley-thumbsup.gif" alt="\\o/" title="\\o/" />',
|
||||
'<img class="smiley" src="' . App::get_baseurl() . '/images/smiley-Oo.gif" alt="o.O" title="o.O" />',
|
||||
'<img class="smiley" src="' . App::get_baseurl() . '/images/smiley-Oo.gif" alt="O.o" title="O.o" />',
|
||||
'<img class="smiley" src="' . App::get_baseurl() . '/images/smiley-Oo.gif" alt="o_O" title="o_O" />',
|
||||
'<img class="smiley" src="' . App::get_baseurl() . '/images/smiley-Oo.gif" alt="O_o" title="O_o" />',
|
||||
'<img class="smiley" src="' . App::get_baseurl() . '/images/smiley-cry.gif" alt=":\'(" title=":\'("/>',
|
||||
'<img class="smiley" src="' . App::get_baseurl() . '/images/smiley-foot-in-mouth.gif" alt=":-!" title=":-!" />',
|
||||
'<img class="smiley" src="' . App::get_baseurl() . '/images/smiley-undecided.gif" alt=":-/" title=":-/" />',
|
||||
'<img class="smiley" src="' . App::get_baseurl() . '/images/smiley-embarassed.gif" alt=":-[" title=":-[" />',
|
||||
'<img class="smiley" src="' . App::get_baseurl() . '/images/smiley-cool.gif" alt="8-)" title="8-)" />',
|
||||
'<img class="smiley" src="' . App::get_baseurl() . '/images/beer_mug.gif" alt=":beer" title=":beer" />',
|
||||
'<img class="smiley" src="' . App::get_baseurl() . '/images/beer_mug.gif" alt=":homebrew" title=":homebrew" />',
|
||||
'<img class="smiley" src="' . App::get_baseurl() . '/images/coffee.gif" alt=":coffee" title=":coffee" />',
|
||||
'<img class="smiley" src="' . App::get_baseurl() . '/images/smiley-facepalm.gif" alt=":facepalm" title=":facepalm" />',
|
||||
'<img class="smiley" src="' . App::get_baseurl() . '/images/like.gif" alt=":like" title=":like" />',
|
||||
'<img class="smiley" src="' . App::get_baseurl() . '/images/dislike.gif" alt=":dislike" title=":dislike" />',
|
||||
'<a href="http://friendica.com">~friendica <img class="smiley" src="' . App::get_baseurl() . '/images/friendica-16.png" alt="~friendica" title="~friendica" /></a>',
|
||||
'<a href="http://redmatrix.me/">red<img class="smiley" src="' . App::get_baseurl() . '/images/rm-16.png" alt="red#" title="red#" />matrix</a>',
|
||||
'<a href="http://redmatrix.me/">red<img class="smiley" src="' . App::get_baseurl() . '/images/rm-16.png" alt="red#matrix" title="red#matrix" />matrix</a>'
|
||||
'<img class="smiley" src="' . System::baseUrl() . '/images/smiley-heart.gif" alt="<3" title="<3" />',
|
||||
'<img class="smiley" src="' . System::baseUrl() . '/images/smiley-brokenheart.gif" alt="</3" title="</3" />',
|
||||
'<img class="smiley" src="' . System::baseUrl() . '/images/smiley-brokenheart.gif" alt="<\\3" title="<\\3" />',
|
||||
'<img class="smiley" src="' . System::baseUrl() . '/images/smiley-smile.gif" alt=":-)" title=":-)" />',
|
||||
'<img class="smiley" src="' . System::baseUrl() . '/images/smiley-wink.gif" alt=";-)" title=";-)" />',
|
||||
'<img class="smiley" src="' . System::baseUrl() . '/images/smiley-frown.gif" alt=":-(" title=":-(" />',
|
||||
'<img class="smiley" src="' . System::baseUrl() . '/images/smiley-tongue-out.gif" alt=":-P" title=":-P" />',
|
||||
'<img class="smiley" src="' . System::baseUrl() . '/images/smiley-tongue-out.gif" alt=":-p" title=":-P" />',
|
||||
'<img class="smiley" src="' . System::baseUrl() . '/images/smiley-kiss.gif" alt=":-\" title=":-\" />',
|
||||
'<img class="smiley" src="' . System::baseUrl() . '/images/smiley-kiss.gif" alt=":-\" title=":-\" />',
|
||||
'<img class="smiley" src="' . System::baseUrl() . '/images/smiley-kiss.gif" alt=":-x" title=":-x" />',
|
||||
'<img class="smiley" src="' . System::baseUrl() . '/images/smiley-kiss.gif" alt=":-X" title=":-X" />',
|
||||
'<img class="smiley" src="' . System::baseUrl() . '/images/smiley-laughing.gif" alt=":-D" title=":-D" />',
|
||||
'<img class="smiley" src="' . System::baseUrl() . '/images/smiley-surprised.gif" alt="8-|" title="8-|" />',
|
||||
'<img class="smiley" src="' . System::baseUrl() . '/images/smiley-surprised.gif" alt="8-O" title="8-O" />',
|
||||
'<img class="smiley" src="' . System::baseUrl() . '/images/smiley-surprised.gif" alt=":-O" title="8-O" />',
|
||||
'<img class="smiley" src="' . System::baseUrl() . '/images/smiley-thumbsup.gif" alt="\\o/" title="\\o/" />',
|
||||
'<img class="smiley" src="' . System::baseUrl() . '/images/smiley-Oo.gif" alt="o.O" title="o.O" />',
|
||||
'<img class="smiley" src="' . System::baseUrl() . '/images/smiley-Oo.gif" alt="O.o" title="O.o" />',
|
||||
'<img class="smiley" src="' . System::baseUrl() . '/images/smiley-Oo.gif" alt="o_O" title="o_O" />',
|
||||
'<img class="smiley" src="' . System::baseUrl() . '/images/smiley-Oo.gif" alt="O_o" title="O_o" />',
|
||||
'<img class="smiley" src="' . System::baseUrl() . '/images/smiley-cry.gif" alt=":\'(" title=":\'("/>',
|
||||
'<img class="smiley" src="' . System::baseUrl() . '/images/smiley-foot-in-mouth.gif" alt=":-!" title=":-!" />',
|
||||
'<img class="smiley" src="' . System::baseUrl() . '/images/smiley-undecided.gif" alt=":-/" title=":-/" />',
|
||||
'<img class="smiley" src="' . System::baseUrl() . '/images/smiley-embarassed.gif" alt=":-[" title=":-[" />',
|
||||
'<img class="smiley" src="' . System::baseUrl() . '/images/smiley-cool.gif" alt="8-)" title="8-)" />',
|
||||
'<img class="smiley" src="' . System::baseUrl() . '/images/beer_mug.gif" alt=":beer" title=":beer" />',
|
||||
'<img class="smiley" src="' . System::baseUrl() . '/images/beer_mug.gif" alt=":homebrew" title=":homebrew" />',
|
||||
'<img class="smiley" src="' . System::baseUrl() . '/images/coffee.gif" alt=":coffee" title=":coffee" />',
|
||||
'<img class="smiley" src="' . System::baseUrl() . '/images/smiley-facepalm.gif" alt=":facepalm" title=":facepalm" />',
|
||||
'<img class="smiley" src="' . System::baseUrl() . '/images/like.gif" alt=":like" title=":like" />',
|
||||
'<img class="smiley" src="' . System::baseUrl() . '/images/dislike.gif" alt=":dislike" title=":dislike" />',
|
||||
'<a href="http://friendica.com">~friendica <img class="smiley" src="' . System::baseUrl() . '/images/friendica-16.png" alt="~friendica" title="~friendica" /></a>',
|
||||
'<a href="http://redmatrix.me/">red<img class="smiley" src="' . System::baseUrl() . '/images/rm-16.png" alt="red#" title="red#" />matrix</a>',
|
||||
'<a href="http://redmatrix.me/">red<img class="smiley" src="' . System::baseUrl() . '/images/rm-16.png" alt="red#matrix" title="red#matrix" />matrix</a>'
|
||||
);
|
||||
|
||||
$params = array('texts' => $texts, 'icons' => $icons);
|
||||
|
@ -209,7 +210,7 @@ class Smilies {
|
|||
return $x[0];
|
||||
$t = '';
|
||||
for($cnt = 0; $cnt < strlen($x[1]); $cnt ++)
|
||||
$t .= '<img class="smiley" src="' . App::get_baseurl() . '/images/smiley-heart.gif" alt="<3" />';
|
||||
$t .= '<img class="smiley" src="' . System::baseUrl() . '/images/smiley-heart.gif" alt="<3" />';
|
||||
$r = str_replace($x[0],$t,$x[0]);
|
||||
return $r;
|
||||
}
|
||||
|
|
|
@ -7,6 +7,7 @@
|
|||
*/
|
||||
|
||||
use Friendica\App;
|
||||
use Friendica\Core\System;
|
||||
use Friendica\Core\Config;
|
||||
|
||||
require_once 'include/HTTPExceptions.php';
|
||||
|
@ -96,7 +97,7 @@ $called_api = null;
|
|||
*
|
||||
* Register a function to be the endpont for defined API path.
|
||||
*
|
||||
* @param string $path API URL path, relative to App::get_baseurl()
|
||||
* @param string $path API URL path, relative to System::baseUrl()
|
||||
* @param string $func Function name to call on path request
|
||||
* @param bool $auth API need logged user
|
||||
* @param string $method HTTP method reqiured to call this endpoint.
|
||||
|
@ -436,12 +437,12 @@ $called_api = null;
|
|||
$arr['$user'] = $user_info;
|
||||
$arr['$rss'] = array(
|
||||
'alternate' => $user_info['url'],
|
||||
'self' => App::get_baseurl() . "/" . $a->query_string,
|
||||
'base' => App::get_baseurl(),
|
||||
'self' => System::baseUrl() . "/" . $a->query_string,
|
||||
'base' => System::baseUrl(),
|
||||
'updated' => api_date(null),
|
||||
'atom_updated' => datetime_convert('UTC', 'UTC', 'now', ATOM_TIME),
|
||||
'language' => $user_info['language'],
|
||||
'logo' => App::get_baseurl() . "/images/friendica-32.png",
|
||||
'logo' => System::baseUrl() . "/images/friendica-32.png",
|
||||
);
|
||||
|
||||
return $arr;
|
||||
|
@ -754,7 +755,7 @@ $called_api = null;
|
|||
'statusnet_blocking' => false,
|
||||
'notifications' => false,
|
||||
/// @TODO old way?
|
||||
//'statusnet_profile_url' => App::get_baseurl()."/contacts/".$uinfo[0]['cid'],
|
||||
//'statusnet_profile_url' => System::baseUrl()."/contacts/".$uinfo[0]['cid'],
|
||||
'statusnet_profile_url' => $uinfo[0]['url'],
|
||||
'uid' => intval($uinfo[0]['uid']),
|
||||
'cid' => intval($uinfo[0]['cid']),
|
||||
|
@ -1164,8 +1165,8 @@ $called_api = null;
|
|||
if (dbm::is_result($r)) {
|
||||
$phototypes = Photo::supportedTypes();
|
||||
$ext = $phototypes[$r[0]['type']];
|
||||
$_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]';
|
||||
$_REQUEST['body'] .= "\n\n" . '[url=' . System::baseUrl() . '/photos/' . $r[0]['nickname'] . '/image/' . $r[0]['resource-id'] . ']';
|
||||
$_REQUEST['body'] .= '[img]' . System::baseUrl() . '/photo/' . $r[0]['resource-id'] . '-' . $r[0]['scale'] . '.' . $ext . '[/img][/url]';
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -1929,7 +1930,7 @@ $called_api = null;
|
|||
$start = $page * $count;
|
||||
|
||||
// Ugly code - should be changed
|
||||
$myurl = App::get_baseurl() . '/profile/'. $a->user['nickname'];
|
||||
$myurl = System::baseUrl() . '/profile/'. $a->user['nickname'];
|
||||
$myurl = substr($myurl,strpos($myurl, '://') + 3);
|
||||
//$myurl = str_replace(array('www.','.'),array('','\\.'),$myurl);
|
||||
$myurl = str_replace('www.', '', $myurl);
|
||||
|
@ -2494,7 +2495,7 @@ $called_api = null;
|
|||
$text = preg_replace_callback(
|
||||
"|data:image/([^;]+)[^=]+=*|m",
|
||||
function($match) use ($item) {
|
||||
return App::get_baseurl()."/display/".$item['guid'];
|
||||
return System::baseUrl()."/display/".$item['guid'];
|
||||
},
|
||||
$text);
|
||||
return $text;
|
||||
|
@ -2911,7 +2912,7 @@ $called_api = null;
|
|||
|
||||
$name = $a->config['sitename'];
|
||||
$server = $a->get_hostname();
|
||||
$logo = App::get_baseurl() . '/images/friendica-64.png';
|
||||
$logo = System::baseUrl() . '/images/friendica-64.png';
|
||||
$email = $a->config['admin_email'];
|
||||
$closed = (($a->config['register_policy'] == REGISTER_CLOSED) ? 'true' : 'false');
|
||||
$private = ((Config::get('system', 'block_public')) ? 'true' : 'false');
|
||||
|
@ -2920,7 +2921,7 @@ $called_api = null;
|
|||
$texlimit = string($a->config['api_import_size']);
|
||||
}
|
||||
$ssl = ((Config::get('system', 'have_ssl')) ? 'true' : 'false');
|
||||
$sslserver = (($ssl === 'true') ? str_replace('http:','https:',App::get_baseurl()) : '');
|
||||
$sslserver = (($ssl === 'true') ? str_replace('http:','https:',System::baseUrl()) : '');
|
||||
|
||||
$config = array(
|
||||
'site' => array('name' => $name,'server' => $server, 'theme' => 'default', 'path' => '',
|
||||
|
@ -3422,7 +3423,7 @@ $called_api = null;
|
|||
$photo['album'] = $rr['album'];
|
||||
$photo['filename'] = $rr['filename'];
|
||||
$photo['type'] = $rr['type'];
|
||||
$thumb = App::get_baseurl() . "/photo/" . $rr['resource-id'] . "-" . $rr['scale'] . "." . $typetoext[$rr['type']];
|
||||
$thumb = System::baseUrl() . "/photo/" . $rr['resource-id'] . "-" . $rr['scale'] . "." . $typetoext[$rr['type']];
|
||||
$photo['created'] = $rr['created'];
|
||||
$photo['edited'] = $rr['edited'];
|
||||
$photo['desc'] = $rr['desc'];
|
||||
|
@ -3720,15 +3721,15 @@ $called_api = null;
|
|||
);
|
||||
|
||||
$r = q("UPDATE `contact` SET `photo` = '%s', `thumb` = '%s', `micro` = '%s' WHERE `self` AND `uid` = %d",
|
||||
dbesc(App::get_baseurl() . '/photo/' . $data['photo']['id'] . '-4.' . $fileext),
|
||||
dbesc(App::get_baseurl() . '/photo/' . $data['photo']['id'] . '-5.' . $fileext),
|
||||
dbesc(App::get_baseurl() . '/photo/' . $data['photo']['id'] . '-6.' . $fileext),
|
||||
dbesc(System::baseUrl() . '/photo/' . $data['photo']['id'] . '-4.' . $fileext),
|
||||
dbesc(System::baseUrl() . '/photo/' . $data['photo']['id'] . '-5.' . $fileext),
|
||||
dbesc(System::baseUrl() . '/photo/' . $data['photo']['id'] . '-6.' . $fileext),
|
||||
intval(local_user())
|
||||
);
|
||||
} else {
|
||||
$r = q("UPDATE `profile` SET `photo` = '%s', `thumb` = '%s' WHERE `id` = %d AND `uid` = %d",
|
||||
dbesc(App::get_baseurl() . '/photo/' . $data['photo']['id'] . '-4.' . $filetype),
|
||||
dbesc(App::get_baseurl() . '/photo/' . $data['photo']['id'] . '-5.' . $filetype),
|
||||
dbesc(System::baseUrl() . '/photo/' . $data['photo']['id'] . '-4.' . $filetype),
|
||||
dbesc(System::baseUrl() . '/photo/' . $data['photo']['id'] . '-5.' . $filetype),
|
||||
intval($_REQUEST['profile']),
|
||||
intval(local_user())
|
||||
);
|
||||
|
@ -3744,7 +3745,7 @@ $called_api = null;
|
|||
|
||||
// Update global directory in background
|
||||
//$user = api_get_user(get_app());
|
||||
$url = App::get_baseurl() . '/profile/' . get_app()->user['nickname'];
|
||||
$url = System::baseUrl() . '/profile/' . get_app()->user['nickname'];
|
||||
if ($url && strlen(get_config('system', 'directory'))) {
|
||||
proc_run(PRIORITY_LOW, "include/directory.php", $url);
|
||||
}
|
||||
|
@ -3973,8 +3974,8 @@ $called_api = null;
|
|||
);
|
||||
|
||||
// adds link to the thumbnail scale photo
|
||||
$arr['body'] = '[url=' . App::get_baseurl() . '/photos/' . $owner_record[0]['name'] . '/image/' . $hash . ']'
|
||||
. '[img]' . App::get_baseurl() . '/photo/' . $hash . '-' . "2" . '.'. $typetoext[$filetype] . '[/img]'
|
||||
$arr['body'] = '[url=' . System::baseUrl() . '/photos/' . $owner_record[0]['name'] . '/image/' . $hash . ']'
|
||||
. '[img]' . System::baseUrl() . '/photo/' . $hash . '-' . "2" . '.'. $typetoext[$filetype] . '[/img]'
|
||||
. '[/url]';
|
||||
|
||||
// do the magic for storing the item in the database and trigger the federation to other contacts
|
||||
|
@ -4017,14 +4018,14 @@ $called_api = null;
|
|||
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" => App::get_baseurl() . "/photo/" . $data['photo']['resource-id'] . "-" . $k . "." . $typetoext[$data['photo']['type']]);
|
||||
"href" => System::baseUrl() . "/photo/" . $data['photo']['resource-id'] . "-" . $k . "." . $typetoext[$data['photo']['type']]);
|
||||
}
|
||||
} else {
|
||||
$data['photo']['link'] = array();
|
||||
// when we have profile images we could have only scales from 4 to 6, but index of array always needs to start with 0
|
||||
$i = 0;
|
||||
for ($k = intval($data['photo']['minscale']); $k <= intval($data['photo']['maxscale']); $k++) {
|
||||
$data['photo']['link'][$i] = App::get_baseurl() . "/photo/" . $data['photo']['resource-id'] . "-" . $k . "." . $typetoext[$data['photo']['type']];
|
||||
$data['photo']['link'][$i] = System::baseUrl() . "/photo/" . $data['photo']['resource-id'] . "-" . $k . "." . $typetoext[$data['photo']['type']];
|
||||
$i++;
|
||||
}
|
||||
}
|
||||
|
|
|
@ -1,6 +1,7 @@
|
|||
<?php
|
||||
|
||||
use Friendica\App;
|
||||
use Friendica\Core\System;
|
||||
use Friendica\Core\Config;
|
||||
|
||||
require_once('include/security.php');
|
||||
|
@ -19,7 +20,7 @@ if (isset($_COOKIE["Friendica"])) {
|
|||
if ($data->hash != cookie_hash($r[0])) {
|
||||
logger("Hash for user ".$data->uid." doesn't fit.");
|
||||
nuke_session();
|
||||
goaway(z_root());
|
||||
goaway(System::baseUrl());
|
||||
}
|
||||
|
||||
// Renew the cookie
|
||||
|
@ -50,7 +51,7 @@ if (isset($_SESSION) && x($_SESSION,'authenticated') && (!x($_POST,'auth-params'
|
|||
call_hooks("logging_out");
|
||||
nuke_session();
|
||||
info(t('Logged out.').EOL);
|
||||
goaway(z_root());
|
||||
goaway(System::baseUrl());
|
||||
}
|
||||
|
||||
if (x($_SESSION,'visitor_id') && !x($_SESSION,'uid')) {
|
||||
|
@ -72,7 +73,7 @@ if (isset($_SESSION) && x($_SESSION,'authenticated') && (!x($_POST,'auth-params'
|
|||
logger('Session address changed. Paranoid setting in effect, blocking session. '.
|
||||
$_SESSION['addr'].' != '.$_SERVER['REMOTE_ADDR']);
|
||||
nuke_session();
|
||||
goaway(z_root());
|
||||
goaway(System::baseUrl());
|
||||
}
|
||||
|
||||
$r = q("SELECT `user`.*, `user`.`pubkey` as `upubkey`, `user`.`prvkey` as `uprvkey`
|
||||
|
@ -82,7 +83,7 @@ if (isset($_SESSION) && x($_SESSION,'authenticated') && (!x($_POST,'auth-params'
|
|||
|
||||
if (!dbm::is_result($r)) {
|
||||
nuke_session();
|
||||
goaway(z_root());
|
||||
goaway(System::baseUrl());
|
||||
}
|
||||
|
||||
// Make sure to refresh the last login time for the user if the user
|
||||
|
@ -121,7 +122,7 @@ if (isset($_SESSION) && x($_SESSION,'authenticated') && (!x($_POST,'auth-params'
|
|||
if ($noid || strpos($temp_string,'@') || !validate_url($temp_string)) {
|
||||
$a = get_app();
|
||||
notice(t('Login failed.').EOL);
|
||||
goaway(z_root());
|
||||
goaway(System::baseUrl());
|
||||
// NOTREACHED
|
||||
}
|
||||
|
||||
|
@ -133,7 +134,7 @@ if (isset($_SESSION) && x($_SESSION,'authenticated') && (!x($_POST,'auth-params'
|
|||
$openid->identity = $openid_url;
|
||||
$_SESSION['openid'] = $openid_url;
|
||||
$_SESSION['remember'] = $_POST['remember'];
|
||||
$openid->returnUrl = App::get_baseurl(true).'/openid';
|
||||
$openid->returnUrl = System::baseUrl(true).'/openid';
|
||||
goaway($openid->authUrl());
|
||||
} catch (Exception $e) {
|
||||
notice(t('We encountered a problem while logging in with the OpenID you provided. Please check the correct spelling of the ID.').'<br /><br >'.t('The error message was:').' '.$e->getMessage());
|
||||
|
@ -183,7 +184,7 @@ if (isset($_SESSION) && x($_SESSION,'authenticated') && (!x($_POST,'auth-params'
|
|||
if (!$record || !count($record)) {
|
||||
logger('authenticate: failed login attempt: '.notags(trim($_POST['username'])).' from IP '.$_SERVER['REMOTE_ADDR']);
|
||||
notice(t('Login failed.').EOL);
|
||||
goaway(z_root());
|
||||
goaway(System::baseUrl());
|
||||
}
|
||||
|
||||
if (! $_POST['remember']) {
|
||||
|
|
|
@ -1,6 +1,7 @@
|
|||
<?php
|
||||
|
||||
use Friendica\App;
|
||||
use Friendica\Core\System;
|
||||
use Friendica\Network\Probe;
|
||||
|
||||
use League\HTMLToMarkdown\HtmlConverter;
|
||||
|
@ -241,7 +242,7 @@ function format_event_diaspora($ev) {
|
|||
$ev['start'] , $bd_format ))
|
||||
: day_translate(datetime_convert('UTC', 'UTC',
|
||||
$ev['start'] , $bd_format)))
|
||||
. '](' . App::get_baseurl() . '/localtime/?f=&time=' . urlencode(datetime_convert('UTC','UTC',$ev['start'])) . ")\n";
|
||||
. '](' . System::baseUrl() . '/localtime/?f=&time=' . urlencode(datetime_convert('UTC','UTC',$ev['start'])) . ")\n";
|
||||
|
||||
if (! $ev['nofinish']) {
|
||||
$o .= t('Finishes:') . ' ' . '['
|
||||
|
@ -249,7 +250,7 @@ function format_event_diaspora($ev) {
|
|||
$ev['finish'] , $bd_format ))
|
||||
: day_translate(datetime_convert('UTC', 'UTC',
|
||||
$ev['finish'] , $bd_format )))
|
||||
. '](' . App::get_baseurl() . '/localtime/?f=&time=' . urlencode(datetime_convert('UTC','UTC',$ev['finish'])) . ")\n";
|
||||
. '](' . System::baseUrl() . '/localtime/?f=&time=' . urlencode(datetime_convert('UTC','UTC',$ev['finish'])) . ")\n";
|
||||
}
|
||||
|
||||
if (strlen($ev['location'])) {
|
||||
|
|
|
@ -1,6 +1,7 @@
|
|||
<?php
|
||||
|
||||
use Friendica\App;
|
||||
use Friendica\Core\System;
|
||||
use Friendica\Core\Config;
|
||||
|
||||
require_once 'include/oembed.php';
|
||||
|
@ -700,7 +701,7 @@ function GetProfileUsername($profile, $username, $compact = false, $getnetwork =
|
|||
}
|
||||
|
||||
function bb_DiasporaLinks($match) {
|
||||
return "[url=".App::get_baseurl()."/display/".$match[1]."]".$match[2]."[/url]";
|
||||
return "[url=".System::baseUrl()."/display/".$match[1]."]".$match[2]."[/url]";
|
||||
}
|
||||
|
||||
function bb_RemovePictureLinks($match) {
|
||||
|
@ -1019,7 +1020,7 @@ function bbcode($Text, $preserve_nl = false, $tryoembed = true, $simplehtml = fa
|
|||
// we may need to restrict this further if it picks up too many strays
|
||||
// link acct:user@host to a webfinger profile redirector
|
||||
|
||||
$Text = preg_replace('/acct:([^@]+)@((?!\-)(?:[a-zA-Z\d\-]{0,62}[a-zA-Z\d]\.){1,126}(?!\d+)[a-zA-Z\d]{1,63})/', '<a href="' . App::get_baseurl() . '/acctlink?addr=$1@$2" target="extlink">acct:$1@$2</a>', $Text);
|
||||
$Text = preg_replace('/acct:([^@]+)@((?!\-)(?:[a-zA-Z\d\-]{0,62}[a-zA-Z\d]\.){1,126}(?!\d+)[a-zA-Z\d]{1,63})/', '<a href="' . System::baseUrl() . '/acctlink?addr=$1@$2" target="extlink">acct:$1@$2</a>', $Text);
|
||||
|
||||
// Perform MAIL Search
|
||||
$Text = preg_replace("/\[mail\]([$MAILSearchString]*)\[\/mail\]/", '<a href="mailto:$1">$1</a>', $Text);
|
||||
|
@ -1192,9 +1193,9 @@ function bbcode($Text, $preserve_nl = false, $tryoembed = true, $simplehtml = fa
|
|||
return bb_ShareAttributes($match, $simplehtml);
|
||||
}, $Text);
|
||||
|
||||
$Text = preg_replace("/\[crypt\](.*?)\[\/crypt\]/ism", '<br/><img src="' .App::get_baseurl() . '/images/lock_icon.gif" alt="' . t('Encrypted content') . '" title="' . t('Encrypted content') . '" /><br />', $Text);
|
||||
$Text = preg_replace("/\[crypt(.*?)\](.*?)\[\/crypt\]/ism", '<br/><img src="' .App::get_baseurl() . '/images/lock_icon.gif" alt="' . t('Encrypted content') . '" title="' . '$1' . ' ' . t('Encrypted content') . '" /><br />', $Text);
|
||||
//$Text = preg_replace("/\[crypt=(.*?)\](.*?)\[\/crypt\]/ism", '<br/><img src="' .App::get_baseurl() . '/images/lock_icon.gif" alt="' . t('Encrypted content') . '" title="' . '$1' . ' ' . t('Encrypted content') . '" /><br />', $Text);
|
||||
$Text = preg_replace("/\[crypt\](.*?)\[\/crypt\]/ism", '<br/><img src="' .System::baseUrl() . '/images/lock_icon.gif" alt="' . t('Encrypted content') . '" title="' . t('Encrypted content') . '" /><br />', $Text);
|
||||
$Text = preg_replace("/\[crypt(.*?)\](.*?)\[\/crypt\]/ism", '<br/><img src="' .System::baseUrl() . '/images/lock_icon.gif" alt="' . t('Encrypted content') . '" title="' . '$1' . ' ' . t('Encrypted content') . '" /><br />', $Text);
|
||||
//$Text = preg_replace("/\[crypt=(.*?)\](.*?)\[\/crypt\]/ism", '<br/><img src="' .System::baseUrl() . '/images/lock_icon.gif" alt="' . t('Encrypted content') . '" title="' . '$1' . ' ' . t('Encrypted content') . '" /><br />', $Text);
|
||||
|
||||
// Try to Oembed
|
||||
if ($tryoembed) {
|
||||
|
|
|
@ -1,6 +1,7 @@
|
|||
<?php
|
||||
|
||||
use Friendica\App;
|
||||
use Friendica\Core\System;
|
||||
use Friendica\Core\Config;
|
||||
|
||||
require_once 'include/contact_selectors.php';
|
||||
|
@ -264,7 +265,7 @@ function common_friends_visitor_widget($profile_uid) {
|
|||
|
||||
return replace_macros(get_markup_template('remote_friends_common.tpl'), array(
|
||||
'$desc' => sprintf( tt("%d contact in common", "%d contacts in common", $t), $t),
|
||||
'$base' => App::get_baseurl(),
|
||||
'$base' => System::baseUrl(),
|
||||
'$uid' => $profile_uid,
|
||||
'$cid' => (($cid) ? $cid : '0'),
|
||||
'$linkmore' => (($t > 5) ? 'true' : ''),
|
||||
|
|
|
@ -1,6 +1,7 @@
|
|||
<?php
|
||||
|
||||
use Friendica\App;
|
||||
use Friendica\Core\System;
|
||||
|
||||
require_once "include/bbcode.php";
|
||||
require_once "include/acl_selectors.php";
|
||||
|
@ -65,7 +66,7 @@ function item_redir_and_replace_images($body, $images, $cid) {
|
|||
while ($pos !== false && $cnt < 1000) {
|
||||
|
||||
$search = '/\[url\=(.*?)\]\[!#saved_image([0-9]*)#!\]\[\/url\]' . '/is';
|
||||
$replace = '[url=' . z_path() . '/redir/' . $cid
|
||||
$replace = '[url=' . System::baseUrl() . '/redir/' . $cid
|
||||
. '?f=1&url=' . '$1' . '][!#saved_image' . '$2' .'#!][/url]';
|
||||
|
||||
$newbody .= substr($origbody, 0, $pos['start']['open']);
|
||||
|
@ -680,7 +681,7 @@ function conversation(App $a, $items, $mode, $update, $preview = false) {
|
|||
$hashtags = array();
|
||||
$mentions = array();
|
||||
|
||||
$searchpath = App::get_baseurl()."/search?tag=";
|
||||
$searchpath = System::baseUrl()."/search?tag=";
|
||||
|
||||
$taglist = dba::select('term', array('type', 'term', 'url'),
|
||||
array("`otype` = ? AND `oid` = ? AND `type` IN (?, ?)", TERM_OBJ_POST, $item['id'], TERM_HASHTAG, TERM_MENTION),
|
||||
|
@ -799,7 +800,7 @@ function conversation(App $a, $items, $mode, $update, $preview = false) {
|
|||
'name' => $profile_name_e,
|
||||
'sparkle' => $sparkle,
|
||||
'lock' => $lock,
|
||||
'thumb' => App::remove_baseurl(proxy_url($item['author-thumb'], false, PROXY_SIZE_THUMB)),
|
||||
'thumb' => System::removedBaseUrl(proxy_url($item['author-thumb'], false, PROXY_SIZE_THUMB)),
|
||||
'title' => $item['title_e'],
|
||||
'body' => $body_e,
|
||||
'tags' => $tags_e,
|
||||
|
@ -818,7 +819,7 @@ function conversation(App $a, $items, $mode, $update, $preview = false) {
|
|||
'indent' => '',
|
||||
'owner_name' => $owner_name_e,
|
||||
'owner_url' => $owner_url,
|
||||
'owner_photo' => App::remove_baseurl(proxy_url($item['owner-thumb'], false, PROXY_SIZE_THUMB)),
|
||||
'owner_photo' => System::removedBaseUrl(proxy_url($item['owner-thumb'], false, PROXY_SIZE_THUMB)),
|
||||
'plink' => get_plink($item),
|
||||
'edpost' => false,
|
||||
'isstarred' => $isstarred,
|
||||
|
@ -905,7 +906,7 @@ function conversation(App $a, $items, $mode, $update, $preview = false) {
|
|||
}
|
||||
|
||||
$o = replace_macros($page_template, array(
|
||||
'$baseurl' => App::get_baseurl($ssl_state),
|
||||
'$baseurl' => System::baseUrl($ssl_state),
|
||||
'$return_path' => $a->query_string,
|
||||
'$live_update' => $live_update_div,
|
||||
'$remove' => t('remove'),
|
||||
|
@ -1225,7 +1226,7 @@ function status_editor(App $a, $x, $notes_cid = 0, $popup = false) {
|
|||
$tpl = get_markup_template('jot-header.tpl');
|
||||
$a->page['htmlhead'] .= replace_macros($tpl, array(
|
||||
'$newpost' => 'true',
|
||||
'$baseurl' => App::get_baseurl(true),
|
||||
'$baseurl' => System::baseUrl(true),
|
||||
'$geotag' => $geotag,
|
||||
'$nickname' => $x['nickname'],
|
||||
'$ispublic' => t('Visible to <strong>everybody</strong>'),
|
||||
|
@ -1241,7 +1242,7 @@ function status_editor(App $a, $x, $notes_cid = 0, $popup = false) {
|
|||
$tpl = get_markup_template('jot-end.tpl');
|
||||
$a->page['end'] .= replace_macros($tpl, array(
|
||||
'$newpost' => 'true',
|
||||
'$baseurl' => App::get_baseurl(true),
|
||||
'$baseurl' => System::baseUrl(true),
|
||||
'$geotag' => $geotag,
|
||||
'$nickname' => $x['nickname'],
|
||||
'$ispublic' => t('Visible to <strong>everybody</strong>'),
|
||||
|
@ -1309,7 +1310,7 @@ function status_editor(App $a, $x, $notes_cid = 0, $popup = false) {
|
|||
'$ptyp' => (($notes_cid) ? 'note' : 'wall'),
|
||||
'$content' => $x['content'],
|
||||
'$post_id' => $x['post_id'],
|
||||
'$baseurl' => App::get_baseurl(true),
|
||||
'$baseurl' => System::baseUrl(true),
|
||||
'$defloc' => $x['default_location'],
|
||||
'$visitor' => $x['visitor'],
|
||||
'$pvisit' => (($notes_cid) ? 'none' : $x['visitor']),
|
||||
|
|
|
@ -1,6 +1,7 @@
|
|||
<?php
|
||||
|
||||
use Friendica\App;
|
||||
use Friendica\Core\System;
|
||||
use Friendica\Core\Config;
|
||||
|
||||
require_once "boot.php";
|
||||
|
@ -89,11 +90,11 @@ function update_fail($update_id, $error_message) {
|
|||
$email_tpl = get_intltext_template("update_fail_eml.tpl");
|
||||
$email_msg = replace_macros($email_tpl, array(
|
||||
'$sitename' => $a->config['sitename'],
|
||||
'$siteurl' => App::get_baseurl(),
|
||||
'$siteurl' => System::baseUrl(),
|
||||
'$update' => DB_UPDATE_VERSION,
|
||||
'$error' => sprintf(t('Update %s failed. See error logs.'), DB_UPDATE_VERSION)
|
||||
));
|
||||
$subject=sprintf(t('Update Error at %s'), App::get_baseurl());
|
||||
$subject=sprintf(t('Update Error at %s'), System::baseUrl());
|
||||
require_once('include/email.php');
|
||||
$subject = email_header_encode($subject,'UTF-8');
|
||||
mail($a->config['admin_email'], $subject, $email_msg,
|
||||
|
|
|
@ -1,6 +1,7 @@
|
|||
<?php
|
||||
|
||||
use Friendica\App;
|
||||
use Friendica\Core\System;
|
||||
use Friendica\Core\Config;
|
||||
|
||||
require_once 'include/queue_fn.php';
|
||||
|
@ -299,7 +300,7 @@ function delivery_run(&$argv, &$argc){
|
|||
|
||||
// perform local delivery if we are on the same site
|
||||
|
||||
if (link_compare($basepath,App::get_baseurl())) {
|
||||
if (link_compare($basepath,System::baseUrl())) {
|
||||
|
||||
$nickname = basename($contact['url']);
|
||||
if ($contact['issued-id']) {
|
||||
|
|
|
@ -8,6 +8,7 @@
|
|||
*/
|
||||
|
||||
use Friendica\App;
|
||||
use Friendica\Core\System;
|
||||
|
||||
require_once("include/Contact.php");
|
||||
require_once("include/ostatus.php");
|
||||
|
@ -428,7 +429,7 @@ class dfrn {
|
|||
$ext = Photo::supportedTypes();
|
||||
|
||||
foreach ($rp as $p) {
|
||||
$photos[$p['scale']] = App::get_baseurl().'/photo/'.$p['resource-id'].'-'.$p['scale'].'.'.$ext[$p['type']];
|
||||
$photos[$p['scale']] = System::baseUrl().'/photo/'.$p['resource-id'].'-'.$p['scale'].'.'.$ext[$p['type']];
|
||||
}
|
||||
|
||||
unset($rp, $ext);
|
||||
|
@ -489,7 +490,7 @@ class dfrn {
|
|||
$root->setAttribute("xmlns:ostatus", NAMESPACE_OSTATUS);
|
||||
$root->setAttribute("xmlns:statusnet", NAMESPACE_STATUSNET);
|
||||
|
||||
xml::add_element($doc, $root, "id", App::get_baseurl()."/profile/".$owner["nick"]);
|
||||
xml::add_element($doc, $root, "id", System::baseUrl()."/profile/".$owner["nick"]);
|
||||
xml::add_element($doc, $root, "title", $owner["name"]);
|
||||
|
||||
$attributes = array("uri" => "https://friendi.ca", "version" => FRIENDICA_VERSION."-".DB_UPDATE_VERSION);
|
||||
|
@ -506,13 +507,13 @@ class dfrn {
|
|||
// DFRN itself doesn't uses this. But maybe someone else wants to subscribe to the public feed.
|
||||
ostatus::hublinks($doc, $root, $owner["nick"]);
|
||||
|
||||
$attributes = array("rel" => "salmon", "href" => App::get_baseurl()."/salmon/".$owner["nick"]);
|
||||
$attributes = array("rel" => "salmon", "href" => System::baseUrl()."/salmon/".$owner["nick"]);
|
||||
xml::add_element($doc, $root, "link", "", $attributes);
|
||||
|
||||
$attributes = array("rel" => "http://salmon-protocol.org/ns/salmon-replies", "href" => App::get_baseurl()."/salmon/".$owner["nick"]);
|
||||
$attributes = array("rel" => "http://salmon-protocol.org/ns/salmon-replies", "href" => System::baseUrl()."/salmon/".$owner["nick"]);
|
||||
xml::add_element($doc, $root, "link", "", $attributes);
|
||||
|
||||
$attributes = array("rel" => "http://salmon-protocol.org/ns/salmon-mention", "href" => App::get_baseurl()."/salmon/".$owner["nick"]);
|
||||
$attributes = array("rel" => "http://salmon-protocol.org/ns/salmon-mention", "href" => System::baseUrl()."/salmon/".$owner["nick"]);
|
||||
xml::add_element($doc, $root, "link", "", $attributes);
|
||||
}
|
||||
|
||||
|
@ -569,7 +570,7 @@ class dfrn {
|
|||
}
|
||||
|
||||
xml::add_element($doc, $author, "name", $owner["name"], $attributes);
|
||||
xml::add_element($doc, $author, "uri", App::get_baseurl().'/profile/'.$owner["nickname"], $attributes);
|
||||
xml::add_element($doc, $author, "uri", System::baseUrl().'/profile/'.$owner["nickname"], $attributes);
|
||||
xml::add_element($doc, $author, "dfrn:handle", $owner["addr"], $attributes);
|
||||
|
||||
$attributes = array("rel" => "photo", "type" => "image/jpeg",
|
||||
|
@ -870,13 +871,13 @@ class dfrn {
|
|||
$parent = q("SELECT `guid` FROM `item` WHERE `id` = %d", intval($item["parent"]));
|
||||
$parent_item = (($item['thr-parent']) ? $item['thr-parent'] : $item['parent-uri']);
|
||||
$attributes = array("ref" => $parent_item, "type" => "text/html",
|
||||
"href" => App::get_baseurl().'/display/'.$parent[0]['guid'],
|
||||
"href" => System::baseUrl().'/display/'.$parent[0]['guid'],
|
||||
"dfrn:diaspora_guid" => $parent[0]['guid']);
|
||||
xml::add_element($doc, $entry, "thr:in-reply-to", "", $attributes);
|
||||
}
|
||||
|
||||
// Add conversation data. This is used for OStatus
|
||||
$conversation_href = App::get_baseurl()."/display/".$owner["nick"]."/".$item["parent"];
|
||||
$conversation_href = System::baseUrl()."/display/".$owner["nick"]."/".$item["parent"];
|
||||
$conversation_uri = $conversation_href;
|
||||
|
||||
if (isset($parent_item)) {
|
||||
|
@ -912,7 +913,7 @@ class dfrn {
|
|||
|
||||
// We save this value in "plink". Maybe we should read it from there as well?
|
||||
xml::add_element($doc, $entry, "link", "", array("rel" => "alternate", "type" => "text/html",
|
||||
"href" => App::get_baseurl()."/display/".$item["guid"]));
|
||||
"href" => System::baseUrl()."/display/".$item["guid"]));
|
||||
|
||||
// "comment-allow" is some old fashioned stuff for old Friendica versions.
|
||||
// It is included in the rewritten code for completeness
|
||||
|
@ -1797,7 +1798,7 @@ class dfrn {
|
|||
"to_email" => $importer["email"],
|
||||
"uid" => $importer["importer_uid"],
|
||||
"item" => $suggest,
|
||||
"link" => App::get_baseurl()."/notifications/intros",
|
||||
"link" => System::baseUrl()."/notifications/intros",
|
||||
"source_name" => $importer["name"],
|
||||
"source_link" => $importer["url"],
|
||||
"source_photo" => $importer["photo"],
|
||||
|
@ -2103,7 +2104,7 @@ class dfrn {
|
|||
}
|
||||
}
|
||||
|
||||
if ($Blink && link_compare($Blink, App::get_baseurl() . "/profile/" . $importer["nickname"])) {
|
||||
if ($Blink && link_compare($Blink, System::baseUrl() . "/profile/" . $importer["nickname"])) {
|
||||
|
||||
// send a notification
|
||||
notification(array(
|
||||
|
@ -2114,7 +2115,7 @@ class dfrn {
|
|||
"to_email" => $importer["email"],
|
||||
"uid" => $importer["importer_uid"],
|
||||
"item" => $item,
|
||||
"link" => App::get_baseurl()."/display/".urlencode(get_item_guid($posted_id)),
|
||||
"link" => System::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"]))
|
||||
|
|
|
@ -9,6 +9,7 @@
|
|||
*/
|
||||
|
||||
use Friendica\App;
|
||||
use Friendica\Core\System;
|
||||
use Friendica\Core\Config;
|
||||
|
||||
require_once 'include/items.php';
|
||||
|
@ -1654,7 +1655,7 @@ class Diaspora {
|
|||
|
||||
$ulink = "[url=".$contact["url"]."]".$contact["name"]."[/url]";
|
||||
$alink = "[url=".$parent_item["author-link"]."]".$parent_item["author-name"]."[/url]";
|
||||
$plink = "[url=".App::get_baseurl()."/display/".urlencode($guid)."]".t("status")."[/url]";
|
||||
$plink = "[url=".System::baseUrl()."/display/".urlencode($guid)."]".t("status")."[/url]";
|
||||
|
||||
return sprintf($bodyverb, $ulink, $alink, $plink);
|
||||
}
|
||||
|
@ -1669,7 +1670,7 @@ class Diaspora {
|
|||
*/
|
||||
private static function construct_like_object($importer, $parent_item) {
|
||||
$objtype = ACTIVITY_OBJ_NOTE;
|
||||
$link = '<link rel="alternate" type="text/html" href="'.App::get_baseurl()."/display/".$importer["nickname"]."/".$parent_item["id"].'" />';
|
||||
$link = '<link rel="alternate" type="text/html" href="'.System::baseUrl()."/display/".$importer["nickname"]."/".$parent_item["id"].'" />';
|
||||
$parent_body = $parent_item["body"];
|
||||
|
||||
$xmldata = array("object" => array("type" => $objtype,
|
||||
|
@ -2363,7 +2364,7 @@ class Diaspora {
|
|||
return false;
|
||||
}
|
||||
|
||||
$orig_url = App::get_baseurl()."/display/".$original_item["guid"];
|
||||
$orig_url = System::baseUrl()."/display/".$original_item["guid"];
|
||||
|
||||
$datarray = array();
|
||||
|
||||
|
@ -2653,7 +2654,7 @@ class Diaspora {
|
|||
$nick = $contact["nick"];
|
||||
}
|
||||
|
||||
return $nick."@".substr(App::get_baseurl(), strpos(App::get_baseurl(),"://") + 3);
|
||||
return $nick."@".substr(System::baseUrl(), strpos(System::baseUrl(),"://") + 3);
|
||||
}
|
||||
|
||||
|
||||
|
@ -3620,9 +3621,9 @@ class Diaspora {
|
|||
$first = ((strpos($profile['name'],' ')
|
||||
? trim(substr($profile['name'],0,strpos($profile['name'],' '))) : $profile['name']));
|
||||
$last = (($first === $profile['name']) ? '' : trim(substr($profile['name'], strlen($first))));
|
||||
$large = App::get_baseurl().'/photo/custom/300/'.$profile['uid'].'.jpg';
|
||||
$medium = App::get_baseurl().'/photo/custom/100/'.$profile['uid'].'.jpg';
|
||||
$small = App::get_baseurl().'/photo/custom/50/' .$profile['uid'].'.jpg';
|
||||
$large = System::baseUrl().'/photo/custom/300/'.$profile['uid'].'.jpg';
|
||||
$medium = System::baseUrl().'/photo/custom/100/'.$profile['uid'].'.jpg';
|
||||
$small = System::baseUrl().'/photo/custom/50/' .$profile['uid'].'.jpg';
|
||||
$searchable = (($profile['publish'] && $profile['net-publish']) ? 'true' : 'false');
|
||||
|
||||
if ($searchable === 'true') {
|
||||
|
|
|
@ -1,6 +1,7 @@
|
|||
<?php
|
||||
|
||||
use Friendica\App;
|
||||
use Friendica\Core\System;
|
||||
|
||||
require_once('include/Emailer.php');
|
||||
require_once('include/email.php');
|
||||
|
@ -26,7 +27,7 @@ function notification($params) {
|
|||
|
||||
$banner = t('Friendica Notification');
|
||||
$product = FRIENDICA_PLATFORM;
|
||||
$siteurl = App::get_baseurl(true);
|
||||
$siteurl = System::baseUrl(true);
|
||||
$thanks = t('Thank You,');
|
||||
$sitename = $a->config['sitename'];
|
||||
if (!x($a->config['admin_name']))
|
||||
|
@ -66,7 +67,7 @@ function notification($params) {
|
|||
$additional_mail_header .= "X-Friendica-Platform: ".FRIENDICA_PLATFORM."\n";
|
||||
$additional_mail_header .= "X-Friendica-Version: ".FRIENDICA_VERSION."\n";
|
||||
$additional_mail_header .= "List-ID: <notification.".$hostname.">\n";
|
||||
$additional_mail_header .= "List-Archive: <".App::get_baseurl()."/notifications/system>\n";
|
||||
$additional_mail_header .= "List-Archive: <".System::baseUrl()."/notifications/system>\n";
|
||||
|
||||
if (array_key_exists('item', $params)) {
|
||||
$title = $params['item']['title'];
|
||||
|
@ -502,7 +503,7 @@ function notification($params) {
|
|||
}
|
||||
|
||||
|
||||
$itemlink = App::get_baseurl().'/notify/view/'.$notify_id;
|
||||
$itemlink = System::baseUrl().'/notify/view/'.$notify_id;
|
||||
$msg = replace_macros($epreamble, array('$itemlink' => $itemlink));
|
||||
$msg_cache = format_notification_message($datarray['name_cache'], strip_tags(bbcode($msg)));
|
||||
$r = q("UPDATE `notify` SET `msg` = '%s', `msg_cache` = '%s' WHERE `id` = %d AND `uid` = %d",
|
||||
|
@ -673,7 +674,7 @@ function check_item_notification($itemid, $uid, $defaulttype = "") {
|
|||
$profiles[] = $owner[0]["url"];
|
||||
|
||||
// Notifications from Diaspora are often with an URL in the Diaspora format
|
||||
$profiles[] = App::get_baseurl()."/u/".$user[0]["nickname"];
|
||||
$profiles[] = System::baseUrl()."/u/".$user[0]["nickname"];
|
||||
|
||||
$profiles2 = array();
|
||||
|
||||
|
@ -727,7 +728,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"] = App::get_baseurl().'/display/'.urlencode($item[0]["guid"]);
|
||||
$params["link"] = System::baseUrl().'/display/'.urlencode($item[0]["guid"]);
|
||||
$params["otype"] = 'item';
|
||||
$params["source_name"] = $item[0]["author-name"];
|
||||
$params["source_link"] = $item[0]["author-link"];
|
||||
|
|
|
@ -5,6 +5,7 @@
|
|||
*/
|
||||
|
||||
use Friendica\App;
|
||||
use Friendica\Core\System;
|
||||
|
||||
require_once 'include/bbcode.php';
|
||||
require_once 'include/map.php';
|
||||
|
@ -372,7 +373,7 @@ function event_store($arr) {
|
|||
intval($arr['uid'])
|
||||
);
|
||||
//if (dbm::is_result($r))
|
||||
// $plink = App::get_baseurl() . '/display/' . $r[0]['nickname'] . '/' . $item_id;
|
||||
// $plink = System::baseUrl() . '/display/' . $r[0]['nickname'] . '/' . $item_id;
|
||||
|
||||
|
||||
if ($item_id) {
|
||||
|
@ -589,8 +590,8 @@ function process_events($arr) {
|
|||
// Show edit and drop actions only if the user is the owner of the event and the event
|
||||
// is a real event (no bithdays)
|
||||
if (local_user() && local_user() == $rr['uid'] && $rr['type'] == 'event') {
|
||||
$edit = ((! $rr['cid']) ? array(App::get_baseurl() . '/events/event/' . $rr['id'], t('Edit event'), '', '') : null);
|
||||
$drop = array(App::get_baseurl() . '/events/drop/' . $rr['id'], t('Delete event'), '', '');
|
||||
$edit = ((! $rr['cid']) ? array(System::baseUrl() . '/events/event/' . $rr['id'], t('Edit event'), '', '') : null);
|
||||
$drop = array(System::baseUrl() . '/events/drop/' . $rr['id'], t('Delete event'), '', '');
|
||||
}
|
||||
|
||||
$title = strip_tags(html_entity_decode(bbcode($rr['summary']), ENT_QUOTES, 'UTF-8'));
|
||||
|
|
|
@ -1,6 +1,7 @@
|
|||
<?php
|
||||
|
||||
use Friendica\App;
|
||||
use Friendica\Core\System;
|
||||
|
||||
require_once 'include/probe.php';
|
||||
require_once 'include/socgraph.php';
|
||||
|
@ -109,7 +110,7 @@ function new_contact($uid,$url,$interactive = false) {
|
|||
if ($ret['network'] === NETWORK_DFRN) {
|
||||
if ($interactive) {
|
||||
if (strlen($a->path)) {
|
||||
$myaddr = bin2hex(App::get_baseurl() . '/profile/' . $a->user['nickname']);
|
||||
$myaddr = bin2hex(System::baseUrl() . '/profile/' . $a->user['nickname']);
|
||||
} else {
|
||||
$myaddr = bin2hex($a->user['nickname'] . '@' . $a->get_hostname());
|
||||
}
|
||||
|
|
|
@ -4,6 +4,7 @@
|
|||
*/
|
||||
|
||||
use Friendica\App;
|
||||
use Friendica\Core\System;
|
||||
|
||||
require_once 'include/ForumManager.php';
|
||||
require_once 'include/bbcode.php';
|
||||
|
@ -242,7 +243,7 @@ function profile_sidebar($profile, $block = 0) {
|
|||
if (isset($profile["url"])) {
|
||||
$profile_url = normalise_link($profile["url"]);
|
||||
} else {
|
||||
$profile_url = normalise_link(App::get_baseurl()."/profile/".$profile["nickname"]);
|
||||
$profile_url = normalise_link(System::baseUrl()."/profile/".$profile["nickname"]);
|
||||
}
|
||||
|
||||
if (dba::exists('contact', array('pending' => false, 'uid' => local_user(), 'nurl' => $profile_url))) {
|
||||
|
@ -289,7 +290,7 @@ function profile_sidebar($profile, $block = 0) {
|
|||
|
||||
// show edit profile to yourself
|
||||
if (!$is_contact && $profile['uid'] == local_user() && feature_enabled(local_user(),'multi_profiles')) {
|
||||
$profile['edit'] = array(App::get_baseurl(). '/profiles', t('Profiles'),"", t('Manage/edit profiles'));
|
||||
$profile['edit'] = array(System::baseUrl(). '/profiles', t('Profiles'),"", t('Manage/edit profiles'));
|
||||
$r = q("SELECT * FROM `profile` WHERE `uid` = %d",
|
||||
local_user());
|
||||
|
||||
|
@ -318,7 +319,7 @@ function profile_sidebar($profile, $block = 0) {
|
|||
}
|
||||
}
|
||||
if (!$is_contact && $profile['uid'] == local_user() && !feature_enabled(local_user(),'multi_profiles')) {
|
||||
$profile['edit'] = array(App::get_baseurl(). '/profiles/'.$profile['id'], t('Edit profile'),"", t('Edit profile'));
|
||||
$profile['edit'] = array(System::baseUrl(). '/profiles/'.$profile['id'], t('Edit profile'),"", t('Edit profile'));
|
||||
$profile['menu'] = array(
|
||||
'chg_photo' => t('Change profile photo'),
|
||||
'cr_new' => null,
|
||||
|
@ -359,7 +360,7 @@ function profile_sidebar($profile, $block = 0) {
|
|||
if ($profile['guid'] != "")
|
||||
$diaspora = array(
|
||||
'guid' => $profile['guid'],
|
||||
'podloc' => App::get_baseurl(),
|
||||
'podloc' => System::baseUrl(),
|
||||
'searchable' => (($profile['publish'] && $profile['net-publish']) ? 'true' : 'false' ),
|
||||
'nickname' => $profile['nickname'],
|
||||
'fullname' => $profile['name'],
|
||||
|
@ -509,7 +510,7 @@ function get_birthdays() {
|
|||
$url = $rr['url'];
|
||||
if ($rr['network'] === NETWORK_DFRN) {
|
||||
$sparkle = " sparkle";
|
||||
$url = App::get_baseurl() . '/redir/' . $rr['cid'];
|
||||
$url = System::baseUrl() . '/redir/' . $rr['cid'];
|
||||
}
|
||||
|
||||
$rr['link'] = $url;
|
||||
|
@ -523,7 +524,7 @@ function get_birthdays() {
|
|||
}
|
||||
$tpl = get_markup_template("birthdays_reminder.tpl");
|
||||
return replace_macros($tpl, array(
|
||||
'$baseurl' => App::get_baseurl(),
|
||||
'$baseurl' => System::baseUrl(),
|
||||
'$classtoday' => $classtoday,
|
||||
'$count' => $total,
|
||||
'$event_reminders' => t('Birthday Reminders'),
|
||||
|
@ -611,7 +612,7 @@ function get_events() {
|
|||
}
|
||||
$tpl = get_markup_template("events_reminder.tpl");
|
||||
return replace_macros($tpl, array(
|
||||
'$baseurl' => App::get_baseurl(),
|
||||
'$baseurl' => System::baseUrl(),
|
||||
'$classtoday' => $classtoday,
|
||||
'$count' => count($r),
|
||||
'$event_reminders' => t('Event Reminders'),
|
||||
|
@ -751,7 +752,7 @@ function advanced_profile(App $a) {
|
|||
}
|
||||
|
||||
if ($a->profile['uid'] == local_user()) {
|
||||
$profile['edit'] = array(App::get_baseurl(). '/profiles/'.$a->profile['id'], t('Edit profile'),"", t('Edit profile'));
|
||||
$profile['edit'] = array(System::baseUrl(). '/profiles/'.$a->profile['id'], t('Edit profile'),"", t('Edit profile'));
|
||||
}
|
||||
|
||||
return replace_macros($tpl, array(
|
||||
|
@ -776,7 +777,7 @@ function profile_tabs($a, $is_owner=False, $nickname=Null) {
|
|||
$tab = notags(trim($_GET['tab']));
|
||||
}
|
||||
|
||||
$url = App::get_baseurl() . '/profile/' . $nickname;
|
||||
$url = System::baseUrl() . '/profile/' . $nickname;
|
||||
|
||||
$tabs = array(
|
||||
array(
|
||||
|
@ -797,7 +798,7 @@ function profile_tabs($a, $is_owner=False, $nickname=Null) {
|
|||
),
|
||||
array(
|
||||
'label' => t('Photos'),
|
||||
'url' => App::get_baseurl() . '/photos/' . $nickname,
|
||||
'url' => System::baseUrl() . '/photos/' . $nickname,
|
||||
'sel' => ((!isset($tab) && $a->argv[0]=='photos') ? 'active' : ''),
|
||||
'title' => t('Photo Albums'),
|
||||
'id' => 'photo-tab',
|
||||
|
@ -805,7 +806,7 @@ function profile_tabs($a, $is_owner=False, $nickname=Null) {
|
|||
),
|
||||
array(
|
||||
'label' => t('Videos'),
|
||||
'url' => App::get_baseurl() . '/videos/' . $nickname,
|
||||
'url' => System::baseUrl() . '/videos/' . $nickname,
|
||||
'sel' => ((!isset($tab) && $a->argv[0]=='videos') ? 'active' : ''),
|
||||
'title' => t('Videos'),
|
||||
'id' => 'video-tab',
|
||||
|
@ -817,7 +818,7 @@ function profile_tabs($a, $is_owner=False, $nickname=Null) {
|
|||
if ($is_owner && $a->theme_events_in_profile) {
|
||||
$tabs[] = array(
|
||||
'label' => t('Events'),
|
||||
'url' => App::get_baseurl() . '/events',
|
||||
'url' => System::baseUrl() . '/events',
|
||||
'sel' =>((!isset($tab) && $a->argv[0]=='events') ? 'active' : ''),
|
||||
'title' => t('Events and Calendar'),
|
||||
'id' => 'events-tab',
|
||||
|
@ -828,7 +829,7 @@ function profile_tabs($a, $is_owner=False, $nickname=Null) {
|
|||
} elseif (! $is_owner) {
|
||||
$tabs[] = array(
|
||||
'label' => t('Events'),
|
||||
'url' => App::get_baseurl() . '/cal/' . $nickname,
|
||||
'url' => System::baseUrl() . '/cal/' . $nickname,
|
||||
'sel' =>((!isset($tab) && $a->argv[0]=='cal') ? 'active' : ''),
|
||||
'title' => t('Events and Calendar'),
|
||||
'id' => 'events-tab',
|
||||
|
@ -839,7 +840,7 @@ function profile_tabs($a, $is_owner=False, $nickname=Null) {
|
|||
if ($is_owner) {
|
||||
$tabs[] = array(
|
||||
'label' => t('Personal Notes'),
|
||||
'url' => App::get_baseurl() . '/notes',
|
||||
'url' => System::baseUrl() . '/notes',
|
||||
'sel' =>((!isset($tab) && $a->argv[0]=='notes') ? 'active' : ''),
|
||||
'title' => t('Only You Can See This'),
|
||||
'id' => 'notes-tab',
|
||||
|
@ -850,7 +851,7 @@ function profile_tabs($a, $is_owner=False, $nickname=Null) {
|
|||
if ((! $is_owner) && ((count($a->profile)) || (! $a->profile['hide-friends']))) {
|
||||
$tabs[] = array(
|
||||
'label' => t('Contacts'),
|
||||
'url' => App::get_baseurl() . '/viewcontacts/' . $nickname,
|
||||
'url' => System::baseUrl() . '/viewcontacts/' . $nickname,
|
||||
'sel' => ((!isset($tab) && $a->argv[0]=='viewcontacts') ? 'active' : ''),
|
||||
'title' => t('Contacts'),
|
||||
'id' => 'viewcontacts-tab',
|
||||
|
|
|
@ -5,6 +5,7 @@
|
|||
*/
|
||||
|
||||
use Friendica\App;
|
||||
use Friendica\Core\System;
|
||||
use Friendica\ParseUrl;
|
||||
use Friendica\Util\Lock;
|
||||
use Friendica\Core\Config;
|
||||
|
@ -222,7 +223,7 @@ function add_page_info_data($data) {
|
|||
/// @todo make a positive list of allowed characters
|
||||
$hashtag = str_replace(array(" ", "+", "/", ".", "#", "'", "’", "`", "(", ")", "„", "“"),
|
||||
array("", "", "", "", "", "", "", "", "", "", "", ""), $keyword);
|
||||
$hashtags .= "#[url=" . App::get_baseurl() . "/search?tag=" . rawurlencode($hashtag) . "]" . $hashtag . "[/url] ";
|
||||
$hashtags .= "#[url=" . System::baseUrl() . "/search?tag=" . rawurlencode($hashtag) . "]" . $hashtag . "[/url] ";
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -270,7 +271,7 @@ function add_page_keywords($url, $no_photos = false, $photo = "", $keywords = fa
|
|||
$tags .= ", ";
|
||||
}
|
||||
|
||||
$tags .= "#[url=" . App::get_baseurl() . "/search?tag=" . rawurlencode($hashtag) . "]" . $hashtag . "[/url]";
|
||||
$tags .= "#[url=" . System::baseUrl() . "/search?tag=" . rawurlencode($hashtag) . "]" . $hashtag . "[/url]";
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -669,7 +670,7 @@ function item_store($arr, $force_parent = false, $notify = false, $dontcache = f
|
|||
}
|
||||
|
||||
if ($arr['plink'] == "") {
|
||||
$arr['plink'] = App::get_baseurl() . '/display/' . urlencode($arr['guid']);
|
||||
$arr['plink'] = System::baseUrl() . '/display/' . urlencode($arr['guid']);
|
||||
}
|
||||
|
||||
if ($arr['network'] == "") {
|
||||
|
@ -841,7 +842,7 @@ function item_store($arr, $force_parent = false, $notify = false, $dontcache = f
|
|||
$u = q("SELECT `nickname` FROM `user` WHERE `uid` = %d", intval($arr['uid']));
|
||||
if (dbm::is_result($u)) {
|
||||
$a = get_app();
|
||||
$self = normalise_link(App::get_baseurl() . '/profile/' . $u[0]['nickname']);
|
||||
$self = normalise_link(System::baseUrl() . '/profile/' . $u[0]['nickname']);
|
||||
logger("item_store: 'myself' is ".$self." for parent ".$parent_id." checking against ".$arr['author-link']." and ".$arr['owner-link'], LOGGER_DEBUG);
|
||||
if ((normalise_link($arr['author-link']) == $self) || (normalise_link($arr['owner-link']) == $self)) {
|
||||
dba::update('thread', array('mention' => true), array('iid' => $parent_id));
|
||||
|
@ -1181,10 +1182,10 @@ function item_body_set_hashtags(&$item) {
|
|||
// All hashtags should point to the home server if "local_tags" is activated
|
||||
if (Config::get('system', 'local_tags')) {
|
||||
$item["body"] = preg_replace("/#\[url\=([$URLSearchString]*)\](.*?)\[\/url\]/ism",
|
||||
"#[url=".App::get_baseurl()."/search?tag=$2]$2[/url]", $item["body"]);
|
||||
"#[url=".System::baseUrl()."/search?tag=$2]$2[/url]", $item["body"]);
|
||||
|
||||
$item["tag"] = preg_replace("/#\[url\=([$URLSearchString]*)\](.*?)\[\/url\]/ism",
|
||||
"#[url=".App::get_baseurl()."/search?tag=$2]$2[/url]", $item["tag"]);
|
||||
"#[url=".System::baseUrl()."/search?tag=$2]$2[/url]", $item["tag"]);
|
||||
}
|
||||
|
||||
// mask hashtags inside of url, bookmarks and attachments to avoid urls in urls
|
||||
|
@ -1214,7 +1215,7 @@ function item_body_set_hashtags(&$item) {
|
|||
|
||||
$basetag = str_replace('_',' ',substr($tag,1));
|
||||
|
||||
$newtag = '#[url=' . App::get_baseurl() . '/search?tag=' . rawurlencode($basetag) . ']' . $basetag . '[/url]';
|
||||
$newtag = '#[url=' . System::baseUrl() . '/search?tag=' . rawurlencode($basetag) . ']' . $basetag . '[/url]';
|
||||
|
||||
$item["body"] = str_replace($tag, $newtag, $item["body"]);
|
||||
|
||||
|
@ -1324,13 +1325,13 @@ function tag_deliver($uid, $item_id) {
|
|||
|
||||
$item = $i[0];
|
||||
|
||||
$link = normalise_link(App::get_baseurl() . '/profile/' . $u[0]['nickname']);
|
||||
$link = normalise_link(System::baseUrl() . '/profile/' . $u[0]['nickname']);
|
||||
|
||||
/*
|
||||
* Diaspora uses their own hardwired link URL in @-tags
|
||||
* instead of the one we supply with webfinger
|
||||
*/
|
||||
$dlink = normalise_link(App::get_baseurl() . '/u/' . $u[0]['nickname']);
|
||||
$dlink = normalise_link(System::baseUrl() . '/u/' . $u[0]['nickname']);
|
||||
|
||||
$cnt = preg_match_all('/[\@\!]\[url\=(.*?)\](.*?)\[\/url\]/ism', $item['body'], $matches, PREG_SET_ORDER);
|
||||
if ($cnt) {
|
||||
|
@ -1427,13 +1428,13 @@ function tgroup_check($uid, $item) {
|
|||
$community_page = (($u[0]['page-flags'] == PAGE_COMMUNITY) ? true : false);
|
||||
$prvgroup = (($u[0]['page-flags'] == PAGE_PRVGROUP) ? true : false);
|
||||
|
||||
$link = normalise_link(App::get_baseurl() . '/profile/' . $u[0]['nickname']);
|
||||
$link = normalise_link(System::baseUrl() . '/profile/' . $u[0]['nickname']);
|
||||
|
||||
/*
|
||||
* Diaspora uses their own hardwired link URL in @-tags
|
||||
* instead of the one we supply with webfinger
|
||||
*/
|
||||
$dlink = normalise_link(App::get_baseurl() . '/u/' . $u[0]['nickname']);
|
||||
$dlink = normalise_link(System::baseUrl() . '/u/' . $u[0]['nickname']);
|
||||
|
||||
$cnt = preg_match_all('/[\@\!]\[url\=(.*?)\](.*?)\[\/url\]/ism', $item['body'], $matches, PREG_SET_ORDER);
|
||||
if ($cnt) {
|
||||
|
@ -1698,7 +1699,7 @@ function new_follower($importer, $contact, $datarray, $item, $sharing = false) {
|
|||
'to_name' => $r[0]['username'],
|
||||
'to_email' => $r[0]['email'],
|
||||
'uid' => $r[0]['uid'],
|
||||
'link' => App::get_baseurl() . '/notifications/intro',
|
||||
'link' => System::baseUrl() . '/notifications/intro',
|
||||
'source_name' => ((strlen(stripslashes($contact_record['name']))) ? stripslashes($contact_record['name']) : t('[Name Withheld]')),
|
||||
'source_link' => $contact_record['url'],
|
||||
'source_photo' => $contact_record['photo'],
|
||||
|
@ -1784,7 +1785,7 @@ function fix_private_photos($s, $uid, $item = null, $cid = 0) {
|
|||
$a = get_app();
|
||||
|
||||
logger('fix_private_photos: check for photos', LOGGER_DEBUG);
|
||||
$site = substr(App::get_baseurl(),strpos(App::get_baseurl(),'://'));
|
||||
$site = substr(System::baseUrl(),strpos(System::baseUrl(),'://'));
|
||||
|
||||
$orig_body = $s;
|
||||
$new_body = '';
|
||||
|
@ -2076,7 +2077,7 @@ function drop_item($id, $interactive = true) {
|
|||
return 0;
|
||||
}
|
||||
notice( t('Item not found.') . EOL);
|
||||
goaway(App::get_baseurl() . '/' . $_SESSION['return_url']);
|
||||
goaway(System::baseUrl() . '/' . $_SESSION['return_url']);
|
||||
}
|
||||
|
||||
$item = $r[0];
|
||||
|
@ -2128,7 +2129,7 @@ function drop_item($id, $interactive = true) {
|
|||
}
|
||||
// Now check how the user responded to the confirmation query
|
||||
if ($_REQUEST['canceled']) {
|
||||
goaway(App::get_baseurl() . '/' . $_SESSION['return_url']);
|
||||
goaway(System::baseUrl() . '/' . $_SESSION['return_url']);
|
||||
}
|
||||
|
||||
logger('delete item: ' . $item['id'], LOGGER_DEBUG);
|
||||
|
@ -2253,14 +2254,14 @@ function drop_item($id, $interactive = true) {
|
|||
if (! $interactive) {
|
||||
return $owner;
|
||||
}
|
||||
goaway(App::get_baseurl() . '/' . $_SESSION['return_url']);
|
||||
goaway(System::baseUrl() . '/' . $_SESSION['return_url']);
|
||||
//NOTREACHED
|
||||
} else {
|
||||
if (! $interactive) {
|
||||
return 0;
|
||||
}
|
||||
notice( t('Permission denied.') . EOL);
|
||||
goaway(App::get_baseurl() . '/' . $_SESSION['return_url']);
|
||||
goaway(System::baseUrl() . '/' . $_SESSION['return_url']);
|
||||
//NOTREACHED
|
||||
}
|
||||
|
||||
|
|
|
@ -1,6 +1,7 @@
|
|||
<?php
|
||||
|
||||
use Friendica\App;
|
||||
use Friendica\Core\System;
|
||||
|
||||
require_once("include/diaspora.php");
|
||||
|
||||
|
@ -183,7 +184,7 @@ function do_like($item_id, $verb) {
|
|||
$post_type = t('event');
|
||||
}
|
||||
$objtype = $item['resource-id'] ? ACTIVITY_OBJ_IMAGE : ACTIVITY_OBJ_NOTE ;
|
||||
$link = xmlify('<link rel="alternate" type="text/html" href="' . App::get_baseurl() . '/display/' . $owner_self_contact['nick'] . '/' . $item['id'] . '" />' . "\n") ;
|
||||
$link = xmlify('<link rel="alternate" type="text/html" href="' . System::baseUrl() . '/display/' . $owner_self_contact['nick'] . '/' . $item['id'] . '" />' . "\n") ;
|
||||
$body = $item['body'];
|
||||
|
||||
$obj = <<< EOT
|
||||
|
@ -200,7 +201,7 @@ EOT;
|
|||
|
||||
$ulink = '[url=' . $author_contact['url'] . ']' . $author_contact['name'] . '[/url]';
|
||||
$alink = '[url=' . $item['author-link'] . ']' . $item['author-name'] . '[/url]';
|
||||
$plink = '[url=' . App::get_baseurl() . '/display/' . $owner_self_contact['nick'] . '/' . $item['id'] . ']' . $post_type . '[/url]';
|
||||
$plink = '[url=' . System::baseUrl() . '/display/' . $owner_self_contact['nick'] . '/' . $item['id'] . ']' . $post_type . '[/url]';
|
||||
|
||||
$new_item = array(
|
||||
'guid' => get_guid(32),
|
||||
|
|
|
@ -3,6 +3,7 @@
|
|||
// send a private message
|
||||
|
||||
use Friendica\App;
|
||||
use Friendica\Core\System;
|
||||
|
||||
function send_message($recipient=0, $body='', $subject='', $replyto=''){
|
||||
|
||||
|
@ -26,7 +27,7 @@ function send_message($recipient=0, $body='', $subject='', $replyto=''){
|
|||
}
|
||||
|
||||
$guid = get_guid(32);
|
||||
$uri = 'urn:X-dfrn:' . App::get_baseurl() . ':' . local_user() . ':' . $guid;
|
||||
$uri = 'urn:X-dfrn:' . System::baseUrl() . ':' . local_user() . ':' . $guid;
|
||||
|
||||
$convid = 0;
|
||||
$reply = false;
|
||||
|
@ -52,7 +53,7 @@ function send_message($recipient=0, $body='', $subject='', $replyto=''){
|
|||
$recip_host = substr($recip_host,0,strpos($recip_host,'/'));
|
||||
|
||||
$recip_handle = (($contact[0]['addr']) ? $contact[0]['addr'] : $contact[0]['nick'] . '@' . $recip_host);
|
||||
$sender_handle = $a->user['nickname'] . '@' . substr(App::get_baseurl(), strpos(App::get_baseurl(),'://') + 3);
|
||||
$sender_handle = $a->user['nickname'] . '@' . substr(System::baseUrl(), strpos(System::baseUrl(),'://') + 3);
|
||||
|
||||
$conv_guid = get_guid(32);
|
||||
$convuri = $recip_handle.':'.$conv_guid;
|
||||
|
@ -133,7 +134,7 @@ function send_message($recipient=0, $body='', $subject='', $replyto=''){
|
|||
$images = $match[1];
|
||||
if (count($images)) {
|
||||
foreach ($images as $image) {
|
||||
if (! stristr($image,App::get_baseurl() . '/photo/')) {
|
||||
if (! stristr($image,System::baseUrl() . '/photo/')) {
|
||||
continue;
|
||||
}
|
||||
$image_uri = substr($image,strrpos($image,'/') + 1);
|
||||
|
@ -169,7 +170,7 @@ function send_wallmessage($recipient='', $body='', $subject='', $replyto=''){
|
|||
}
|
||||
|
||||
$guid = get_guid(32);
|
||||
$uri = 'urn:X-dfrn:' . App::get_baseurl() . ':' . local_user() . ':' . $guid;
|
||||
$uri = 'urn:X-dfrn:' . System::baseUrl() . ':' . local_user() . ':' . $guid;
|
||||
|
||||
$convid = 0;
|
||||
$reply = false;
|
||||
|
@ -184,7 +185,7 @@ function send_wallmessage($recipient='', $body='', $subject='', $replyto=''){
|
|||
|
||||
$conv_guid = get_guid(32);
|
||||
|
||||
$recip_handle = $recipient['nickname'] . '@' . substr(App::get_baseurl(), strpos(App::get_baseurl(),'://') + 3);
|
||||
$recip_handle = $recipient['nickname'] . '@' . substr(System::baseUrl(), strpos(System::baseUrl(),'://') + 3);
|
||||
|
||||
$sender_nick = basename($replyto);
|
||||
$sender_host = substr($replyto,strpos($replyto,'://')+3);
|
||||
|
|
|
@ -1,6 +1,7 @@
|
|||
<?php
|
||||
|
||||
use Friendica\App;
|
||||
use Friendica\Core\System;
|
||||
|
||||
function nav(App $a) {
|
||||
|
||||
|
@ -30,7 +31,7 @@ function nav(App $a) {
|
|||
$tpl = get_markup_template('nav.tpl');
|
||||
|
||||
$a->page['nav'] .= replace_macros($tpl, array(
|
||||
'$baseurl' => App::get_baseurl(),
|
||||
'$baseurl' => System::baseUrl(),
|
||||
'$sitelocation' => $nav_info['sitelocation'],
|
||||
'$nav' => $nav_info['nav'],
|
||||
'$banner' => $nav_info['banner'],
|
||||
|
@ -67,7 +68,7 @@ function nav_info(App $a)
|
|||
|
||||
$myident = ((is_array($a->user) && isset($a->user['nickname'])) ? $a->user['nickname'] . '@' : '');
|
||||
|
||||
$sitelocation = $myident . substr(App::get_baseurl($ssl_state), strpos(App::get_baseurl($ssl_state), '//') + 2 );
|
||||
$sitelocation = $myident . substr(System::baseUrl($ssl_state), strpos(System::baseUrl($ssl_state), '//') + 2 );
|
||||
|
||||
// nav links: array of array('href', 'text', 'extra css classes', 'title')
|
||||
$nav = array();
|
||||
|
|
|
@ -5,6 +5,7 @@
|
|||
*/
|
||||
|
||||
use Friendica\App;
|
||||
use Friendica\Core\System;
|
||||
use Friendica\Core\Config;
|
||||
use Friendica\Network\Probe;
|
||||
|
||||
|
@ -611,7 +612,7 @@ function avatar_img($email) {
|
|||
call_hooks('avatar_lookup', $avatar);
|
||||
|
||||
if (! $avatar['success']) {
|
||||
$avatar['url'] = App::get_baseurl() . '/images/person-175.jpg';
|
||||
$avatar['url'] = System::baseUrl() . '/images/person-175.jpg';
|
||||
}
|
||||
|
||||
logger('Avatar: ' . $avatar['email'] . ' ' . $avatar['url'], LOGGER_DEBUG);
|
||||
|
@ -660,7 +661,7 @@ function scale_external_images($srctext, $include_link = true, $scale_replace =
|
|||
foreach ($matches as $mtch) {
|
||||
logger('scale_external_image: ' . $mtch[1]);
|
||||
|
||||
$hostname = str_replace('www.','',substr(App::get_baseurl(),strpos(App::get_baseurl(),'://')+3));
|
||||
$hostname = str_replace('www.','',substr(System::baseUrl(),strpos(System::baseUrl(),'://')+3));
|
||||
if (stristr($mtch[1],$hostname)) {
|
||||
continue;
|
||||
}
|
||||
|
|
|
@ -6,6 +6,7 @@
|
|||
*/
|
||||
|
||||
use Friendica\App;
|
||||
use Friendica\Core\System;
|
||||
|
||||
define('REQUEST_TOKEN_DURATION', 300);
|
||||
define('ACCESS_TOKEN_DURATION', 31536000);
|
||||
|
@ -150,7 +151,7 @@ class FKOAuth1 extends OAuthServer {
|
|||
$_SESSION['mobile-theme'] = get_pconfig($record['uid'], 'system', 'mobile_theme');
|
||||
$_SESSION['authenticated'] = 1;
|
||||
$_SESSION['page_flags'] = $record['page-flags'];
|
||||
$_SESSION['my_url'] = App::get_baseurl() . '/profile/' . $record['nickname'];
|
||||
$_SESSION['my_url'] = System::baseUrl() . '/profile/' . $record['nickname'];
|
||||
$_SESSION['addr'] = $_SERVER['REMOTE_ADDR'];
|
||||
$_SESSION["allow_api"] = true;
|
||||
|
||||
|
|
|
@ -5,6 +5,7 @@
|
|||
*/
|
||||
|
||||
use Friendica\App;
|
||||
use Friendica\Core\System;
|
||||
use Friendica\ParseUrl;
|
||||
use Friendica\Core\Config;
|
||||
|
||||
|
@ -152,7 +153,7 @@ function oembed_format_object($j){
|
|||
$th=120; $tw = $th*$tr;
|
||||
$tpl=get_markup_template('oembed_video.tpl');
|
||||
$ret.=replace_macros($tpl, array(
|
||||
'$baseurl' => App::get_baseurl(),
|
||||
'$baseurl' => System::baseUrl(),
|
||||
'$embedurl' => $embedurl,
|
||||
'$escapedhtml' => base64_encode($jhtml),
|
||||
'$tw' => $tw,
|
||||
|
@ -249,7 +250,7 @@ function oembed_iframe($src, $width, $height) {
|
|||
}
|
||||
$width = '100%';
|
||||
|
||||
$s = App::get_baseurl() . '/oembed/' . base64url_encode($src);
|
||||
$s = System::baseUrl() . '/oembed/' . base64url_encode($src);
|
||||
return '<iframe onload="resizeIframe(this);" class="embed_rich" height="' . $height . '" width="' . $width . '" src="' . $s . '" allowfullscreen scrolling="no" frameborder="no">' . t('Embedded content') . '</iframe>';
|
||||
}
|
||||
|
||||
|
|
|
@ -4,6 +4,7 @@
|
|||
*/
|
||||
|
||||
use Friendica\App;
|
||||
use Friendica\Core\System;
|
||||
use Friendica\Core\Config;
|
||||
use Friendica\Network\Probe;
|
||||
|
||||
|
@ -456,7 +457,7 @@ class ostatus {
|
|||
if (strlen($item["tag"])) {
|
||||
$item["tag"] .= ',';
|
||||
}
|
||||
$item["tag"] .= "#[url=".App::get_baseurl()."/search?tag=".$term."]".$term."[/url]";
|
||||
$item["tag"] .= "#[url=".System::baseUrl()."/search?tag=".$term."]".$term."[/url]";
|
||||
}
|
||||
}
|
||||
}
|
||||
|
@ -1452,7 +1453,7 @@ class ostatus {
|
|||
|
||||
$attributes = array("uri" => "https://friendi.ca", "version" => FRIENDICA_VERSION."-".DB_UPDATE_VERSION);
|
||||
xml::add_element($doc, $root, "generator", FRIENDICA_PLATFORM, $attributes);
|
||||
xml::add_element($doc, $root, "id", App::get_baseurl()."/profile/".$owner["nick"]);
|
||||
xml::add_element($doc, $root, "id", System::baseUrl()."/profile/".$owner["nick"]);
|
||||
xml::add_element($doc, $root, "title", sprintf("%s timeline", $owner["name"]));
|
||||
xml::add_element($doc, $root, "subtitle", sprintf("Updates from %s on %s", $owner["name"], $a->config["sitename"]));
|
||||
xml::add_element($doc, $root, "logo", $owner["photo"]);
|
||||
|
@ -1465,23 +1466,23 @@ class ostatus {
|
|||
xml::add_element($doc, $root, "link", "", $attributes);
|
||||
|
||||
/// @TODO We have to find out what this is
|
||||
/// $attributes = array("href" => App::get_baseurl()."/sup",
|
||||
/// $attributes = array("href" => System::baseUrl()."/sup",
|
||||
/// "rel" => "http://api.friendfeed.com/2008/03#sup",
|
||||
/// "type" => "application/json");
|
||||
/// xml::add_element($doc, $root, "link", "", $attributes);
|
||||
|
||||
self::hublinks($doc, $root, $owner["nick"]);
|
||||
|
||||
$attributes = array("href" => App::get_baseurl()."/salmon/".$owner["nick"], "rel" => "salmon");
|
||||
$attributes = array("href" => System::baseUrl()."/salmon/".$owner["nick"], "rel" => "salmon");
|
||||
xml::add_element($doc, $root, "link", "", $attributes);
|
||||
|
||||
$attributes = array("href" => App::get_baseurl()."/salmon/".$owner["nick"], "rel" => "http://salmon-protocol.org/ns/salmon-replies");
|
||||
$attributes = array("href" => System::baseUrl()."/salmon/".$owner["nick"], "rel" => "http://salmon-protocol.org/ns/salmon-replies");
|
||||
xml::add_element($doc, $root, "link", "", $attributes);
|
||||
|
||||
$attributes = array("href" => App::get_baseurl()."/salmon/".$owner["nick"], "rel" => "http://salmon-protocol.org/ns/salmon-mention");
|
||||
$attributes = array("href" => System::baseUrl()."/salmon/".$owner["nick"], "rel" => "http://salmon-protocol.org/ns/salmon-mention");
|
||||
xml::add_element($doc, $root, "link", "", $attributes);
|
||||
|
||||
$attributes = array("href" => App::get_baseurl()."/api/statuses/user_timeline/".$owner["nick"].".atom",
|
||||
$attributes = array("href" => System::baseUrl()."/api/statuses/user_timeline/".$owner["nick"].".atom",
|
||||
"rel" => "self", "type" => "application/atom+xml");
|
||||
xml::add_element($doc, $root, "link", "", $attributes);
|
||||
|
||||
|
@ -1495,7 +1496,7 @@ class ostatus {
|
|||
* @param object $root XML root element where the hub links are added
|
||||
*/
|
||||
public static function hublinks($doc, $root, $nick) {
|
||||
$h = App::get_baseurl() . '/pubsubhubbub/'.$nick;
|
||||
$h = System::baseUrl() . '/pubsubhubbub/'.$nick;
|
||||
xml::add_element($doc, $root, "link", "", array("href" => $h, "rel" => "hub"));
|
||||
}
|
||||
|
||||
|
@ -1625,7 +1626,7 @@ class ostatus {
|
|||
}
|
||||
|
||||
if (count($profile)) {
|
||||
xml::add_element($doc, $author, "followers", "", array("url" => App::get_baseurl()."/viewcontacts/".$owner["nick"]));
|
||||
xml::add_element($doc, $author, "followers", "", array("url" => System::baseUrl()."/viewcontacts/".$owner["nick"]));
|
||||
xml::add_element($doc, $author, "statusnet:profile_info", "", array("local_id" => $owner["uid"]));
|
||||
}
|
||||
|
||||
|
@ -2066,7 +2067,7 @@ class ostatus {
|
|||
xml::add_element($doc, $entry, "content", $body, array("type" => "html"));
|
||||
|
||||
xml::add_element($doc, $entry, "link", "", array("rel" => "alternate", "type" => "text/html",
|
||||
"href" => App::get_baseurl()."/display/".$item["guid"]));
|
||||
"href" => System::baseUrl()."/display/".$item["guid"]));
|
||||
|
||||
if ($complete && ($item["id"] > 0))
|
||||
xml::add_element($doc, $entry, "status_net", "", array("notice_id" => $item["id"]));
|
||||
|
@ -2104,7 +2105,7 @@ class ostatus {
|
|||
} else {
|
||||
$mentioned[$parent[0]["author-link"]] = $parent[0]["author-link"];
|
||||
$mentioned[$parent[0]["owner-link"]] = $parent[0]["owner-link"];
|
||||
$parent_plink = App::get_baseurl()."/display/".$parent[0]["guid"];
|
||||
$parent_plink = System::baseUrl()."/display/".$parent[0]["guid"];
|
||||
}
|
||||
|
||||
$attributes = array(
|
||||
|
@ -2119,7 +2120,7 @@ class ostatus {
|
|||
}
|
||||
|
||||
if (intval($item["parent"]) > 0) {
|
||||
$conversation_href = App::get_baseurl()."/display/".$owner["nick"]."/".$item["parent"];
|
||||
$conversation_href = System::baseUrl()."/display/".$owner["nick"]."/".$item["parent"];
|
||||
$conversation_uri = $conversation_href;
|
||||
|
||||
if (isset($parent_item)) {
|
||||
|
|
|
@ -6,6 +6,7 @@
|
|||
*/
|
||||
|
||||
use Friendica\App;
|
||||
use Friendica\Core\System;
|
||||
|
||||
/**
|
||||
* @brief uninstalls an addon.
|
||||
|
@ -401,10 +402,10 @@ function get_theme_screenshot($theme) {
|
|||
$exts = array('.png','.jpg');
|
||||
foreach ($exts as $ext) {
|
||||
if (file_exists('view/theme/' . $theme . '/screenshot' . $ext)) {
|
||||
return(App::get_baseurl() . '/view/theme/' . $theme . '/screenshot' . $ext);
|
||||
return(System::baseUrl() . '/view/theme/' . $theme . '/screenshot' . $ext);
|
||||
}
|
||||
}
|
||||
return(App::get_baseurl() . '/images/blank.png');
|
||||
return(System::baseUrl() . '/images/blank.png');
|
||||
}
|
||||
|
||||
// install and uninstall theme
|
||||
|
|
|
@ -1,6 +1,7 @@
|
|||
<?php
|
||||
|
||||
use Friendica\App;
|
||||
use Friendica\Core\System;
|
||||
use Friendica\Core\Config;
|
||||
use Friendica\Util\Lock;
|
||||
|
||||
|
@ -799,7 +800,7 @@ function call_worker() {
|
|||
return;
|
||||
}
|
||||
|
||||
$url = App::get_baseurl()."/worker";
|
||||
$url = System::baseUrl()."/worker";
|
||||
fetch_url($url, false, $redirects, 1);
|
||||
}
|
||||
|
||||
|
|
|
@ -1,6 +1,7 @@
|
|||
<?php
|
||||
|
||||
use Friendica\App;
|
||||
use Friendica\Core\System;
|
||||
use Friendica\Core\Config;
|
||||
|
||||
require_once('include/items.php');
|
||||
|
@ -54,7 +55,7 @@ function handle_pubsubhubbub($id) {
|
|||
|
||||
$headers = array("Content-type: application/atom+xml",
|
||||
sprintf("Link: <%s>;rel=hub,<%s>;rel=self",
|
||||
App::get_baseurl().'/pubsubhubbub/'.$rr['nickname'],
|
||||
System::baseUrl().'/pubsubhubbub/'.$rr['nickname'],
|
||||
$rr['topic']),
|
||||
"X-Hub-Signature: sha1=".$hmac_sig);
|
||||
|
||||
|
|
|
@ -1,6 +1,7 @@
|
|||
<?php
|
||||
|
||||
use Friendica\App;
|
||||
use Friendica\Core\System;
|
||||
|
||||
function auto_redir(App $a, $contact_nick) {
|
||||
|
||||
|
@ -22,7 +23,7 @@ function auto_redir(App $a, $contact_nick) {
|
|||
//
|
||||
// We also have to make sure that I'm a legitimate contact--I'm not blocked or pending.
|
||||
|
||||
$baseurl = App::get_baseurl();
|
||||
$baseurl = System::baseUrl();
|
||||
$domain_st = strpos($baseurl, "://");
|
||||
if ($domain_st === false)
|
||||
return;
|
||||
|
|
|
@ -1,6 +1,7 @@
|
|||
<?php
|
||||
|
||||
use Friendica\App;
|
||||
use Friendica\Core\System;
|
||||
|
||||
/**
|
||||
* @brief Calculate the hash that is needed for the "Friendica" cookie
|
||||
|
@ -50,8 +51,8 @@ function authenticate_success($user_record, $login_initial = false, $interactive
|
|||
$_SESSION['mobile-theme'] = get_pconfig($user_record['uid'], 'system', 'mobile_theme');
|
||||
$_SESSION['authenticated'] = 1;
|
||||
$_SESSION['page_flags'] = $user_record['page-flags'];
|
||||
$_SESSION['my_url'] = App::get_baseurl() . '/profile/' . $user_record['nickname'];
|
||||
$_SESSION['my_address'] = $user_record['nickname'] . '@' . substr(App::get_baseurl(),strpos(App::get_baseurl(),'://')+3);
|
||||
$_SESSION['my_url'] = System::baseUrl() . '/profile/' . $user_record['nickname'];
|
||||
$_SESSION['my_address'] = $user_record['nickname'] . '@' . substr(System::baseUrl(),strpos(System::baseUrl(),'://')+3);
|
||||
$_SESSION['addr'] = $_SERVER['REMOTE_ADDR'];
|
||||
|
||||
$a->user = $user_record;
|
||||
|
@ -147,7 +148,7 @@ function authenticate_success($user_record, $login_initial = false, $interactive
|
|||
call_hooks('logged_in', $a->user);
|
||||
|
||||
if (($a->module !== 'home') && isset($_SESSION['return_url'])) {
|
||||
goaway(App::get_baseurl() . '/' . $_SESSION['return_url']);
|
||||
goaway(System::baseUrl() . '/' . $_SESSION['return_url']);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
@ -428,7 +429,7 @@ function check_form_security_token_redirectOnErr($err_redirect, $typename = '',
|
|||
logger('check_form_security_token failed: user ' . $a->user['guid'] . ' - form element ' . $typename);
|
||||
logger('check_form_security_token failed: _REQUEST data: ' . print_r($_REQUEST, true), LOGGER_DATA);
|
||||
notice( check_form_security_std_err_msg() );
|
||||
goaway(App::get_baseurl() . $err_redirect );
|
||||
goaway(System::baseUrl() . $err_redirect );
|
||||
}
|
||||
}
|
||||
function check_form_security_token_ForbiddenOnErr($typename = '', $formname = 'form_security_token') {
|
||||
|
|
|
@ -8,6 +8,7 @@
|
|||
*/
|
||||
|
||||
use Friendica\App;
|
||||
use Friendica\Core\System;
|
||||
use Friendica\Core\Config;
|
||||
use Friendica\Network\Probe;
|
||||
|
||||
|
@ -243,7 +244,7 @@ function sanitize_gcontact($gcontact) {
|
|||
$alternate = poco_alternate_ostatus_url($gcontact['url']);
|
||||
|
||||
// The global contacts should contain the original picture, not the cached one
|
||||
if (($gcontact['generation'] != 1) && stristr(normalise_link($gcontact['photo']), normalise_link(App::get_baseurl()."/photo/"))) {
|
||||
if (($gcontact['generation'] != 1) && stristr(normalise_link($gcontact['photo']), normalise_link(System::baseUrl()."/photo/"))) {
|
||||
$gcontact['photo'] = "";
|
||||
}
|
||||
|
||||
|
@ -1633,9 +1634,9 @@ function update_suggestions() {
|
|||
$done = array();
|
||||
|
||||
/// @TODO Check if it is really neccessary to poll the own server
|
||||
poco_load(0, 0, 0, App::get_baseurl() . '/poco');
|
||||
poco_load(0, 0, 0, System::baseUrl() . '/poco');
|
||||
|
||||
$done[] = App::get_baseurl() . '/poco';
|
||||
$done[] = System::baseUrl() . '/poco';
|
||||
|
||||
if (strlen(get_config('system','directory'))) {
|
||||
$x = fetch_url(get_server()."/pubsites");
|
||||
|
@ -2320,7 +2321,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://"), "", App::get_baseurl());
|
||||
$addr = $r[0]["nickname"].'@'.str_replace(array("http://", "https://"), "", System::baseUrl());
|
||||
} else {
|
||||
$addr = $r[0]["addr"];
|
||||
}
|
||||
|
@ -2331,7 +2332,7 @@ function update_gcontact_for_user($uid) {
|
|||
"notify" => $r[0]["notify"], "url" => $r[0]["url"],
|
||||
"hide" => ($r[0]["hidewall"] || !$r[0]["net-publish"]),
|
||||
"nick" => $r[0]["nickname"], "addr" => $addr,
|
||||
"connect" => $addr, "server_url" => App::get_baseurl(),
|
||||
"connect" => $addr, "server_url" => System::baseUrl(),
|
||||
"generation" => 1, "network" => NETWORK_DFRN);
|
||||
|
||||
update_gcontact($gcontact);
|
||||
|
@ -2390,7 +2391,7 @@ function gs_fetch_users($server) {
|
|||
"nick" => $user->nickname,
|
||||
"about" => $user->bio,
|
||||
"network" => NETWORK_OSTATUS,
|
||||
"photo" => App::get_baseurl()."/images/person-175.jpg");
|
||||
"photo" => System::baseUrl()."/images/person-175.jpg");
|
||||
get_gcontact_id($contact);
|
||||
}
|
||||
}
|
||||
|
|
|
@ -1,9 +1,10 @@
|
|||
<?php
|
||||
|
||||
use Friendica\App;
|
||||
use Friendica\Core\System;
|
||||
|
||||
function create_tags_from_item($itemid) {
|
||||
$profile_base = App::get_baseurl();
|
||||
$profile_base = System::baseUrl();
|
||||
$profile_data = parse_url($profile_base);
|
||||
$profile_base_friendica = $profile_data['host'].$profile_data['path']."/profile/";
|
||||
$profile_base_diaspora = $profile_data['host'].$profile_data['path']."/u/";
|
||||
|
|
|
@ -1,6 +1,7 @@
|
|||
<?php
|
||||
|
||||
use Friendica\App;
|
||||
use Friendica\Core\System;
|
||||
|
||||
require_once "include/template_processor.php";
|
||||
require_once "include/friendica_smarty.php";
|
||||
|
@ -24,7 +25,7 @@ function replace_macros($s, $r) {
|
|||
$a = get_app();
|
||||
|
||||
// pass $baseurl to all templates
|
||||
$r['$baseurl'] = App::get_baseurl();
|
||||
$r['$baseurl'] = System::baseUrl();
|
||||
|
||||
$t = $a->template_engine();
|
||||
try {
|
||||
|
@ -1311,7 +1312,7 @@ function prepare_body(&$item, $attach = false, $preview = false) {
|
|||
$a = get_app();
|
||||
call_hooks('prepare_body_init', $item);
|
||||
|
||||
$searchpath = z_root() . "/search?tag=";
|
||||
$searchpath = System::baseUrl() . "/search?tag=";
|
||||
|
||||
$tags = array();
|
||||
$hashtags = array();
|
||||
|
@ -1394,10 +1395,10 @@ function prepare_body(&$item, $attach = false, $preview = false) {
|
|||
if (!$vhead) {
|
||||
$vhead = true;
|
||||
$a->page['htmlhead'] .= replace_macros(get_markup_template('videos_head.tpl'), array(
|
||||
'$baseurl' => z_root(),
|
||||
'$baseurl' => System::baseUrl(),
|
||||
));
|
||||
$a->page['end'] .= replace_macros(get_markup_template('videos_end.tpl'), array(
|
||||
'$baseurl' => z_root(),
|
||||
'$baseurl' => System::baseUrl(),
|
||||
));
|
||||
}
|
||||
|
||||
|
|
|
@ -1,6 +1,7 @@
|
|||
<?php
|
||||
|
||||
use Friendica\App;
|
||||
use Friendica\Core\System;
|
||||
|
||||
function add_thread($itemid, $onlyshadow = false) {
|
||||
$items = q("SELECT `uid`, `created`, `edited`, `commented`, `received`, `changed`, `wall`, `private`, `pubmail`,
|
||||
|
@ -277,7 +278,7 @@ function update_threads_mention() {
|
|||
$users = q("SELECT `uid`, `nickname` FROM `user` ORDER BY `uid`");
|
||||
|
||||
foreach ($users AS $user) {
|
||||
$self = normalise_link(App::get_baseurl() . '/profile/' . $user['nickname']);
|
||||
$self = normalise_link(System::baseUrl() . '/profile/' . $user['nickname']);
|
||||
$selfhttps = str_replace("http://", "https://", $self);
|
||||
$parents = q("SELECT DISTINCT(`parent`) FROM `item` WHERE `uid` = %d AND
|
||||
((`owner-link` IN ('%s', '%s')) OR (`author-link` IN ('%s', '%s')))",
|
||||
|
|
|
@ -1,6 +1,7 @@
|
|||
<?php
|
||||
|
||||
use Friendica\App;
|
||||
use Friendica\Core\System;
|
||||
|
||||
require_once("include/Photo.php");
|
||||
define("IMPORT_DEBUG", False);
|
||||
|
@ -123,7 +124,7 @@ function import_account(App $a, $file) {
|
|||
}
|
||||
|
||||
$oldbaseurl = $account['baseurl'];
|
||||
$newbaseurl = App::get_baseurl();
|
||||
$newbaseurl = System::baseUrl();
|
||||
$olduid = $account['user']['uid'];
|
||||
|
||||
unset($account['user']['uid']);
|
||||
|
@ -277,5 +278,5 @@ function import_account(App $a, $file) {
|
|||
proc_run(PRIORITY_HIGH, 'include/notifier.php', 'relocate', $newuid);
|
||||
|
||||
info(t("Done. You can now login with your username and password"));
|
||||
goaway(App::get_baseurl() . "/login");
|
||||
goaway(System::baseUrl() . "/login");
|
||||
}
|
||||
|
|
|
@ -1,5 +1,7 @@
|
|||
<?php
|
||||
|
||||
use Friendica\Core\System;
|
||||
|
||||
require_once('include/config.php');
|
||||
require_once('include/network.php');
|
||||
require_once('include/plugin.php');
|
||||
|
@ -66,7 +68,7 @@ function create_user($arr) {
|
|||
require_once('library/openid.php');
|
||||
$openid = new LightOpenID;
|
||||
$openid->identity = $openid_url;
|
||||
$openid->returnUrl = z_root() . '/openid';
|
||||
$openid->returnUrl = System::baseUrl() . '/openid';
|
||||
$openid->required = array('namePerson/friendly', 'contact/email', 'namePerson');
|
||||
$openid->optional = array('namePerson/first','media/image/aspect11','media/image/default');
|
||||
try {
|
||||
|
@ -237,8 +239,8 @@ function create_user($arr) {
|
|||
t('default'),
|
||||
1,
|
||||
dbesc($username),
|
||||
dbesc(z_root() . "/photo/profile/{$newuid}.jpg"),
|
||||
dbesc(z_root() . "/photo/avatar/{$newuid}.jpg"),
|
||||
dbesc(System::baseUrl() . "/photo/profile/{$newuid}.jpg"),
|
||||
dbesc(System::baseUrl() . "/photo/avatar/{$newuid}.jpg"),
|
||||
intval($publish),
|
||||
intval($netpublish)
|
||||
|
||||
|
@ -368,17 +370,17 @@ function user_create_self_contact($uid) {
|
|||
datetime_convert(),
|
||||
dbesc($user['username']),
|
||||
dbesc($user['nickname']),
|
||||
dbesc(z_root()."/photo/profile/".$user['uid'].".jpg"),
|
||||
dbesc(z_root()."/photo/avatar/".$user['uid'].".jpg"),
|
||||
dbesc(z_root()."/photo/micro/".$user['uid'].".jpg"),
|
||||
dbesc(z_root()."/profile/".$user['nickname']),
|
||||
dbesc(normalise_link(z_root()."/profile/".$user['nickname'])),
|
||||
dbesc($user['nickname'].'@'.substr(z_root(), strpos(z_root(),'://') + 3)),
|
||||
dbesc(z_root()."/dfrn_request/".$user['nickname']),
|
||||
dbesc(z_root()."/dfrn_notify/".$user['nickname']),
|
||||
dbesc(z_root()."/dfrn_poll/".$user['nickname']),
|
||||
dbesc(z_root()."/dfrn_confirm/".$user['nickname']),
|
||||
dbesc(z_root()."/poco/".$user['nickname']),
|
||||
dbesc(System::baseUrl()."/photo/profile/".$user['uid'].".jpg"),
|
||||
dbesc(System::baseUrl()."/photo/avatar/".$user['uid'].".jpg"),
|
||||
dbesc(System::baseUrl()."/photo/micro/".$user['uid'].".jpg"),
|
||||
dbesc(System::baseUrl()."/profile/".$user['nickname']),
|
||||
dbesc(normalise_link(System::baseUrl()."/profile/".$user['nickname'])),
|
||||
dbesc($user['nickname'].'@'.substr(System::baseUrl(), strpos(System::baseUrl(),'://') + 3)),
|
||||
dbesc(System::baseUrl()."/dfrn_request/".$user['nickname']),
|
||||
dbesc(System::baseUrl()."/dfrn_notify/".$user['nickname']),
|
||||
dbesc(System::baseUrl()."/dfrn_poll/".$user['nickname']),
|
||||
dbesc(System::baseUrl()."/dfrn_confirm/".$user['nickname']),
|
||||
dbesc(System::baseUrl()."/poco/".$user['nickname']),
|
||||
dbesc(datetime_convert()),
|
||||
dbesc(datetime_convert()),
|
||||
dbesc(datetime_convert())
|
||||
|
|
11
index.php
11
index.php
|
@ -14,6 +14,7 @@
|
|||
*/
|
||||
|
||||
use Friendica\App;
|
||||
use Friendica\Core\System;
|
||||
use Friendica\Core\Config;
|
||||
|
||||
require_once 'boot.php';
|
||||
|
@ -62,15 +63,15 @@ if (!$install) {
|
|||
if ($a->max_processes_reached() || $a->maxload_reached()) {
|
||||
header($_SERVER["SERVER_PROTOCOL"] . ' 503 Service Temporarily Unavailable');
|
||||
header('Retry-After: 120');
|
||||
header('Refresh: 120; url=' . App::get_baseurl() . "/" . $a->query_string);
|
||||
header('Refresh: 120; url=' . System::baseUrl() . "/" . $a->query_string);
|
||||
die("System is currently unavailable. Please try again later");
|
||||
}
|
||||
|
||||
if (get_config('system', 'force_ssl') && ($a->get_scheme() == "http") &&
|
||||
(intval(get_config('system', 'ssl_policy')) == SSL_POLICY_FULL) &&
|
||||
(substr(App::get_baseurl(), 0, 8) == "https://")) {
|
||||
(substr(System::baseUrl(), 0, 8) == "https://")) {
|
||||
header("HTTP/1.1 302 Moved Temporarily");
|
||||
header("Location: " . App::get_baseurl() . "/" . $a->query_string);
|
||||
header("Location: " . System::baseUrl() . "/" . $a->query_string);
|
||||
exit();
|
||||
}
|
||||
|
||||
|
@ -154,7 +155,7 @@ if ((x($_GET,'zrl')) && (!$install && !$maintenance)) {
|
|||
*
|
||||
*/
|
||||
|
||||
// header('Link: <' . App::get_baseurl() . '/amcd>; rel="acct-mgmt";');
|
||||
// header('Link: <' . System::baseUrl() . '/amcd>; rel="acct-mgmt";');
|
||||
|
||||
if (x($_COOKIE["Friendica"]) || (x($_SESSION,'authenticated')) || (x($_POST,'auth-params')) || ($a->module === 'login')) {
|
||||
require("include/auth.php");
|
||||
|
@ -294,7 +295,7 @@ if (strlen($a->module)) {
|
|||
|
||||
if ((x($_SERVER,'QUERY_STRING')) && ($_SERVER['QUERY_STRING'] === 'q=internal_error.html') && isset($dreamhost_error_hack)) {
|
||||
logger('index.php: dreamhost_error_hack invoked. Original URI =' . $_SERVER['REQUEST_URI']);
|
||||
goaway(App::get_baseurl() . $_SERVER['REQUEST_URI']);
|
||||
goaway(System::baseUrl() . $_SERVER['REQUEST_URI']);
|
||||
}
|
||||
|
||||
logger('index.php: page not found: ' . $_SERVER['REQUEST_URI'] . ' ADDRESS: ' . $_SERVER['REMOTE_ADDR'] . ' QUERY: ' . $_SERVER['QUERY_STRING'], LOGGER_DEBUG);
|
||||
|
|
|
@ -7,6 +7,7 @@
|
|||
*/
|
||||
|
||||
use Friendica\App;
|
||||
use Friendica\Core\System;
|
||||
use Friendica\Core\Config;
|
||||
|
||||
require_once("include/enotify.php");
|
||||
|
@ -307,7 +308,7 @@ function admin_page_blocklist(App $a) {
|
|||
'$threason' => t('Reason for the block'),
|
||||
'$delentry' => t('Delete entry from blocklist'),
|
||||
'$entries' => $blocklistform,
|
||||
'$baseurl' => App::get_baseurl(true),
|
||||
'$baseurl' => System::baseUrl(true),
|
||||
'$confirm_delete' => t('Delete entry from blocklist?'),
|
||||
'$form_security_token' => get_form_security_token("admin_blocklist")
|
||||
));
|
||||
|
@ -376,7 +377,7 @@ function admin_page_deleteitem(App $a) {
|
|||
'$intro1' => t('On this page you can delete an item from your node. If the item is a top level posting, the entire thread will be deleted.'),
|
||||
'$intro2' => t('You need to know the GUID of the item. You can find it e.g. by looking at the display URL. The last part of http://example.com/display/123456 is the GUID, here 123456.'),
|
||||
'$deleteitemguid' => array('deleteitemguid', t("GUID"), '', t("The GUID of the item you want to delete."), 'required', 'autofocus'),
|
||||
'$baseurl' => App::get_baseurl(),
|
||||
'$baseurl' => System::baseUrl(),
|
||||
'$form_security_token' => get_form_security_token("admin_deleteitem")
|
||||
));
|
||||
}
|
||||
|
@ -552,7 +553,7 @@ function admin_page_federation(App $a) {
|
|||
'$counts' => $counts,
|
||||
'$version' => FRIENDICA_VERSION,
|
||||
'$legendtext' => sprintf(t('Currently this node is aware of %d nodes from the following platforms:'), $total),
|
||||
'$baseurl' => App::get_baseurl(),
|
||||
'$baseurl' => System::baseUrl(),
|
||||
));
|
||||
}
|
||||
|
||||
|
@ -665,7 +666,7 @@ function admin_page_summary(App $a) {
|
|||
'$accounts' => $accounts,
|
||||
'$pending' => array(t('Pending registrations'), $pending),
|
||||
'$version' => array(t('Version'), FRIENDICA_VERSION),
|
||||
'$baseurl' => App::get_baseurl(),
|
||||
'$baseurl' => System::baseUrl(),
|
||||
'$platform' => FRIENDICA_PLATFORM,
|
||||
'$codename' => FRIENDICA_CODENAME,
|
||||
'$build' => get_config('system','build'),
|
||||
|
@ -703,7 +704,7 @@ function admin_page_site_post(App $a) {
|
|||
* send relocate for every local user
|
||||
* */
|
||||
|
||||
$old_url = App::get_baseurl(true);
|
||||
$old_url = System::baseUrl(true);
|
||||
|
||||
// Generate host names for relocation the addresses in the format user@address.tld
|
||||
$new_host = str_replace("http://", "@", normalise_link($new_url));
|
||||
|
@ -1151,7 +1152,7 @@ function admin_page_site(App $a) {
|
|||
'$performance' => t('Performance'),
|
||||
'$worker_title' => t('Worker'),
|
||||
'$relocate'=> t('Relocate - WARNING: advanced function. Could make this server unreachable.'),
|
||||
'$baseurl' => App::get_baseurl(true),
|
||||
'$baseurl' => System::baseUrl(true),
|
||||
// name, label, value, help string, extra data...
|
||||
'$sitename' => array('sitename', t("Site name"), $a->config['sitename'],''),
|
||||
'$hostname' => array('hostname', t("Host name"), $a->config['hostname'], ""),
|
||||
|
@ -1226,14 +1227,14 @@ function admin_page_site(App $a) {
|
|||
'$proxy_disabled' => array('proxy_disabled', t("Disable picture proxy"), get_config('system','proxy_disabled'), t("The picture proxy increases performance and privacy. It shouldn't be used on systems with very low bandwith.")),
|
||||
'$only_tag_search' => array('only_tag_search', t("Only search in tags"), get_config('system','only_tag_search'), t("On large systems the text search can slow down the system extremely.")),
|
||||
|
||||
'$relocate_url' => array('relocate_url', t("New base url"), App::get_baseurl(), t("Change base url for this server. Sends relocate message to all DFRN contacts of all users.")),
|
||||
'$relocate_url' => array('relocate_url', t("New base url"), System::baseUrl(), t("Change base url for this server. Sends relocate message to all DFRN contacts of all users.")),
|
||||
|
||||
'$rino' => array('rino', t("RINO Encryption"), intval(get_config('system','rino_encrypt')), t("Encryption layer between nodes."), array("Disabled", "RINO1 (deprecated)", "RINO2")),
|
||||
|
||||
'$worker_queues' => array('worker_queues', t("Maximum number of parallel workers"), get_config('system','worker_queues'), t("On shared hosters set this to 2. On larger systems, values of 10 are great. Default value is 4.")),
|
||||
'$worker_dont_fork' => array('worker_dont_fork', t("Don't use 'proc_open' with the worker"), get_config('system','worker_dont_fork'), t("Enable this if your system doesn't allow the use of 'proc_open'. This can happen on shared hosters. If this is enabled you should increase the frequency of poller calls in your crontab.")),
|
||||
'$worker_fastlane' => array('worker_fastlane', t("Enable fastlane"), get_config('system','worker_fastlane'), t("When enabed, the fastlane mechanism starts an additional worker if processes with higher priority are blocked by processes of lower priority.")),
|
||||
'$worker_frontend' => array('worker_frontend', t('Enable frontend worker'), get_config('system','frontend_worker'), sprintf(t('When enabled the Worker process is triggered when backend access is performed (e.g. messages being delivered). On smaller sites you might want to call %s/worker on a regular basis via an external cron job. You should only enable this option if you cannot utilize cron/scheduled jobs on your server.'), App::get_baseurl())),
|
||||
'$worker_frontend' => array('worker_frontend', t('Enable frontend worker'), get_config('system','frontend_worker'), sprintf(t('When enabled the Worker process is triggered when backend access is performed (e.g. messages being delivered). On smaller sites you might want to call %s/worker on a regular basis via an external cron job. You should only enable this option if you cannot utilize cron/scheduled jobs on your server.'), System::baseUrl())),
|
||||
|
||||
'$form_security_token' => get_form_security_token("admin_site")
|
||||
|
||||
|
@ -1316,13 +1317,13 @@ function admin_page_dbsync(App $a) {
|
|||
}
|
||||
if (! count($failed)) {
|
||||
$o = replace_macros(get_markup_template('structure_check.tpl'),array(
|
||||
'$base' => App::get_baseurl(true),
|
||||
'$base' => System::baseUrl(true),
|
||||
'$banner' => t('No failed updates.'),
|
||||
'$check' => t('Check database structure'),
|
||||
));
|
||||
} else {
|
||||
$o = replace_macros(get_markup_template('failed_updates.tpl'),array(
|
||||
'$base' => App::get_baseurl(true),
|
||||
'$base' => System::baseUrl(true),
|
||||
'$banner' => t('Failed Updates'),
|
||||
'$desc' => t('This does not include updates prior to 1139, which did not return a status.'),
|
||||
'$mark' => t('Mark success (if update was manually applied)'),
|
||||
|
@ -1390,7 +1391,7 @@ function admin_page_users_post(App $a) {
|
|||
Thank you and welcome to %4$s.'));
|
||||
|
||||
$preamble = sprintf($preamble, $nu['username'], $a->config['sitename']);
|
||||
$body = sprintf($body, App::get_baseurl(), $nu['email'], $result['password'], $a->config['sitename']);
|
||||
$body = sprintf($body, System::baseUrl(), $nu['email'], $result['password'], $a->config['sitename']);
|
||||
|
||||
notification(array(
|
||||
'type' => "SYSTEM_EMAIL",
|
||||
|
@ -1614,7 +1615,7 @@ function admin_page_users(App $a) {
|
|||
'$form_security_token' => get_form_security_token("admin_users"),
|
||||
|
||||
// values //
|
||||
'$baseurl' => App::get_baseurl(true),
|
||||
'$baseurl' => System::baseUrl(true),
|
||||
|
||||
'$pending' => $pending,
|
||||
'deleted' => $deleted,
|
||||
|
@ -1706,7 +1707,7 @@ function admin_page_plugins(App $a) {
|
|||
'$page' => t('Plugins'),
|
||||
'$toggle' => t('Toggle'),
|
||||
'$settings' => t('Settings'),
|
||||
'$baseurl' => App::get_baseurl(true),
|
||||
'$baseurl' => System::baseUrl(true),
|
||||
|
||||
'$plugin' => $plugin,
|
||||
'$status' => $status,
|
||||
|
@ -1731,10 +1732,10 @@ function admin_page_plugins(App $a) {
|
|||
*/
|
||||
|
||||
if (x($_GET,"a") && $_GET['a']=="r") {
|
||||
check_form_security_token_redirectOnErr(App::get_baseurl().'/admin/plugins', 'admin_themes', 't');
|
||||
check_form_security_token_redirectOnErr(System::baseUrl().'/admin/plugins', 'admin_themes', 't');
|
||||
reload_plugins();
|
||||
info("Plugins reloaded");
|
||||
goaway(App::get_baseurl().'/admin/plugins');
|
||||
goaway(System::baseUrl().'/admin/plugins');
|
||||
}
|
||||
|
||||
$plugins = array();
|
||||
|
@ -1769,7 +1770,7 @@ function admin_page_plugins(App $a) {
|
|||
'$page' => t('Plugins'),
|
||||
'$submit' => t('Save Settings'),
|
||||
'$reload' => t('Reload active plugins'),
|
||||
'$baseurl' => App::get_baseurl(true),
|
||||
'$baseurl' => System::baseUrl(true),
|
||||
'$function' => 'plugins',
|
||||
'$plugins' => $plugins,
|
||||
'$pcount' => count($plugins),
|
||||
|
@ -1982,7 +1983,7 @@ function admin_page_themes(App $a) {
|
|||
'$page' => t('Themes'),
|
||||
'$toggle' => t('Toggle'),
|
||||
'$settings' => t('Settings'),
|
||||
'$baseurl' => App::get_baseurl(true),
|
||||
'$baseurl' => System::baseUrl(true),
|
||||
'$plugin' => $theme,
|
||||
'$status' => $status,
|
||||
'$action' => $action,
|
||||
|
@ -2001,7 +2002,7 @@ function admin_page_themes(App $a) {
|
|||
|
||||
// reload active themes
|
||||
if (x($_GET,"a") && $_GET['a']=="r") {
|
||||
check_form_security_token_redirectOnErr(App::get_baseurl().'/admin/themes', 'admin_themes', 't');
|
||||
check_form_security_token_redirectOnErr(System::baseUrl().'/admin/themes', 'admin_themes', 't');
|
||||
if ($themes) {
|
||||
foreach ($themes as $th) {
|
||||
if ($th['allowed']) {
|
||||
|
@ -2011,7 +2012,7 @@ function admin_page_themes(App $a) {
|
|||
}
|
||||
}
|
||||
info("Themes reloaded");
|
||||
goaway(App::get_baseurl().'/admin/themes');
|
||||
goaway(System::baseUrl().'/admin/themes');
|
||||
}
|
||||
|
||||
/*
|
||||
|
@ -2032,7 +2033,7 @@ function admin_page_themes(App $a) {
|
|||
'$page' => t('Themes'),
|
||||
'$submit' => t('Save Settings'),
|
||||
'$reload' => t('Reload active themes'),
|
||||
'$baseurl' => App::get_baseurl(true),
|
||||
'$baseurl' => System::baseUrl(true),
|
||||
'$function' => 'themes',
|
||||
'$plugins' => $xthemes,
|
||||
'$pcount' => count($themes),
|
||||
|
@ -2106,7 +2107,7 @@ function admin_page_logs(App $a) {
|
|||
'$page' => t('Logs'),
|
||||
'$submit' => t('Save Settings'),
|
||||
'$clear' => t('Clear'),
|
||||
'$baseurl' => App::get_baseurl(true),
|
||||
'$baseurl' => System::baseUrl(true),
|
||||
'$logname' => get_config('system','logfile'),
|
||||
|
||||
// name, label, value, help string, extra data...
|
||||
|
|
|
@ -1,6 +1,7 @@
|
|||
<?php
|
||||
|
||||
use Friendica\App;
|
||||
use Friendica\Core\System;
|
||||
|
||||
require_once('include/socgraph.php');
|
||||
require_once('include/Contact.php');
|
||||
|
@ -65,7 +66,7 @@ function allfriends_content(App $a) {
|
|||
$photo_menu = contact_photo_menu ($rr);
|
||||
}
|
||||
else {
|
||||
$connlnk = App::get_baseurl() . '/follow/?url=' . $rr['url'];
|
||||
$connlnk = System::baseUrl() . '/follow/?url=' . $rr['url'];
|
||||
$photo_menu = array(
|
||||
'profile' => array(t("View Profile"), zrl($rr['url'])),
|
||||
'follow' => array(t("Connect/Follow"), $connlnk)
|
||||
|
|
|
@ -1,6 +1,7 @@
|
|||
<?php
|
||||
|
||||
use Friendica\App;
|
||||
use Friendica\Core\System;
|
||||
|
||||
require_once('include/conversation.php');
|
||||
require_once('include/items.php');
|
||||
|
@ -17,7 +18,7 @@ function bookmarklet_content(App $a) {
|
|||
}
|
||||
|
||||
$referer = normalise_link($_SERVER["HTTP_REFERER"]);
|
||||
$page = normalise_link(App::get_baseurl()."/bookmarklet");
|
||||
$page = normalise_link(System::baseUrl()."/bookmarklet");
|
||||
|
||||
if (!strstr($referer, $page)) {
|
||||
$content = add_page_info($_REQUEST["url"]);
|
||||
|
|
13
mod/cal.php
13
mod/cal.php
|
@ -7,6 +7,7 @@
|
|||
*/
|
||||
|
||||
use Friendica\App;
|
||||
use Friendica\Core\System;
|
||||
|
||||
require_once('include/event.php');
|
||||
require_once('include/redir.php');
|
||||
|
@ -78,7 +79,7 @@ function cal_content(App $a) {
|
|||
|
||||
$htpl = get_markup_template('event_head.tpl');
|
||||
$a->page['htmlhead'] .= replace_macros($htpl,array(
|
||||
'$baseurl' => App::get_baseurl(),
|
||||
'$baseurl' => System::baseUrl(),
|
||||
'$module_url' => '/cal/' . $a->data['user']['nickname'],
|
||||
'$modparams' => 2,
|
||||
'$i18n' => $i18n,
|
||||
|
@ -86,7 +87,7 @@ function cal_content(App $a) {
|
|||
|
||||
$etpl = get_markup_template('event_end.tpl');
|
||||
$a->page['end'] .= replace_macros($etpl,array(
|
||||
'$baseurl' => App::get_baseurl(),
|
||||
'$baseurl' => System::baseUrl(),
|
||||
));
|
||||
|
||||
$o ="";
|
||||
|
@ -228,7 +229,7 @@ function cal_content(App $a) {
|
|||
foreach ($r as $rr) {
|
||||
$j = (($rr['adjust']) ? datetime_convert('UTC',date_default_timezone_get(),$rr['start'], 'j') : datetime_convert('UTC','UTC',$rr['start'],'j'));
|
||||
if (! x($links,$j)) {
|
||||
$links[$j] = App::get_baseurl() . '/' . $a->cmd . '#link-' . $j;
|
||||
$links[$j] = System::baseUrl() . '/' . $a->cmd . '#link-' . $j;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
@ -267,12 +268,12 @@ function cal_content(App $a) {
|
|||
}
|
||||
|
||||
$o = replace_macros($tpl, array(
|
||||
'$baseurl' => App::get_baseurl(),
|
||||
'$baseurl' => System::baseUrl(),
|
||||
'$tabs' => $tabs,
|
||||
'$title' => t('Events'),
|
||||
'$view' => t('View'),
|
||||
'$previous' => array(App::get_baseurl()."/events/$prevyear/$prevmonth", t('Previous'),'',''),
|
||||
'$next' => array(App::get_baseurl()."/events/$nextyear/$nextmonth", t('Next'),'',''),
|
||||
'$previous' => array(System::baseUrl()."/events/$prevyear/$prevmonth", t('Previous'),'',''),
|
||||
'$next' => array(System::baseUrl()."/events/$nextyear/$nextmonth", t('Next'),'',''),
|
||||
'$calendar' => cal($y,$m,$links, ' eventcal'),
|
||||
|
||||
'$events' => $events,
|
||||
|
|
|
@ -1,6 +1,7 @@
|
|||
<?php
|
||||
|
||||
use Friendica\App;
|
||||
use Friendica\Core\System;
|
||||
use Friendica\Network\Probe;
|
||||
|
||||
require_once 'include/Contact.php';
|
||||
|
@ -84,16 +85,16 @@ function contacts_init(App $a) {
|
|||
'$networks_widget' => $networks_widget
|
||||
));
|
||||
|
||||
$base = z_root();
|
||||
$base = System::baseUrl();
|
||||
$tpl = get_markup_template("contacts-head.tpl");
|
||||
$a->page['htmlhead'] .= replace_macros($tpl,array(
|
||||
'$baseurl' => App::get_baseurl(true),
|
||||
'$baseurl' => System::baseUrl(true),
|
||||
'$base' => $base
|
||||
));
|
||||
|
||||
$tpl = get_markup_template("contacts-end.tpl");
|
||||
$a->page['end'] .= replace_macros($tpl,array(
|
||||
'$baseurl' => App::get_baseurl(true),
|
||||
'$baseurl' => System::baseUrl(true),
|
||||
'$base' => $base
|
||||
));
|
||||
|
||||
|
@ -493,10 +494,10 @@ function contacts_content(App $a) {
|
|||
$contact = $a->data['contact'];
|
||||
|
||||
$a->page['htmlhead'] .= replace_macros(get_markup_template('contact_head.tpl'), array(
|
||||
'$baseurl' => App::get_baseurl(true),
|
||||
'$baseurl' => System::baseUrl(true),
|
||||
));
|
||||
$a->page['end'] .= replace_macros(get_markup_template('contact_end.tpl'), array(
|
||||
'$baseurl' => App::get_baseurl(true),
|
||||
'$baseurl' => System::baseUrl(true),
|
||||
));
|
||||
|
||||
require_once 'include/contact_selectors.php';
|
||||
|
@ -575,7 +576,7 @@ function contacts_content(App $a) {
|
|||
|
||||
if (in_array($contact['network'], array(NETWORK_DIASPORA, NETWORK_OSTATUS)) &&
|
||||
($contact['rel'] == CONTACT_IS_FOLLOWER))
|
||||
$follow = App::get_baseurl(true)."/follow?url=".urlencode($contact["url"]);
|
||||
$follow = System::baseUrl(true)."/follow?url=".urlencode($contact["url"]);
|
||||
|
||||
// Load contactact related actions like hide, suggest, delete and others
|
||||
$contact_actions = contact_actions($contact);
|
||||
|
@ -801,7 +802,7 @@ function contacts_content(App $a) {
|
|||
|
||||
$tpl = get_markup_template("contacts-template.tpl");
|
||||
$o .= replace_macros($tpl, array(
|
||||
'$baseurl' => z_root(),
|
||||
'$baseurl' => System::baseUrl(),
|
||||
'$header' => t('Contacts') . (($nets) ? ' - ' . network_to_name($nets) : ''),
|
||||
'$tabs' => $t,
|
||||
'$total' => $total,
|
||||
|
|
|
@ -16,6 +16,7 @@
|
|||
// and 10-20 milliseconds to fetch all the child items.
|
||||
|
||||
use Friendica\App;
|
||||
use Friendica\Core\System;
|
||||
|
||||
function content_content(App $a, $update = 0) {
|
||||
|
||||
|
@ -118,7 +119,7 @@ function content_content(App $a, $update = 0) {
|
|||
if($update)
|
||||
killme();
|
||||
notice( t('No such group') . EOL );
|
||||
goaway(App::get_baseurl(true) . '/network');
|
||||
goaway(System::baseUrl(true) . '/network');
|
||||
// NOTREACHED
|
||||
}
|
||||
|
||||
|
@ -198,7 +199,7 @@ function content_content(App $a, $update = 0) {
|
|||
}
|
||||
|
||||
if($conv) {
|
||||
$myurl = App::get_baseurl() . '/profile/'. $a->user['nickname'];
|
||||
$myurl = System::baseUrl() . '/profile/'. $a->user['nickname'];
|
||||
$myurl = substr($myurl,strpos($myurl,'://')+3);
|
||||
$myurl = str_replace('www.','',$myurl);
|
||||
$diasp_url = str_replace('/profile/','/u/',$myurl);
|
||||
|
@ -510,8 +511,8 @@ function render_content(App $a, $items, $mode, $update, $preview = false) {
|
|||
'like' => '',
|
||||
'dislike' => '',
|
||||
'comment' => '',
|
||||
//'conv' => (($preview) ? '' : array('href'=> App::get_baseurl($ssl_state) . '/display/' . $nickname . '/' . $item['id'], 'title'=> t('View in context'))),
|
||||
'conv' => (($preview) ? '' : array('href'=> App::get_baseurl($ssl_state).'/display/'.$item['guid'], 'title'=> t('View in context'))),
|
||||
//'conv' => (($preview) ? '' : array('href'=> System::baseUrl($ssl_state) . '/display/' . $nickname . '/' . $item['id'], 'title'=> t('View in context'))),
|
||||
'conv' => (($preview) ? '' : array('href'=> System::baseUrl($ssl_state).'/display/'.$item['guid'], 'title'=> t('View in context'))),
|
||||
'previewing' => $previewing,
|
||||
'wait' => t('Please wait'),
|
||||
);
|
||||
|
@ -744,7 +745,7 @@ function render_content(App $a, $items, $mode, $update, $preview = false) {
|
|||
}
|
||||
|
||||
if (local_user() && link_compare($a->contact['url'],$item['author-link'])) {
|
||||
$edpost = array(App::get_baseurl($ssl_state)."/editpost/".$item['id'], t("Edit"));
|
||||
$edpost = array(System::baseUrl($ssl_state)."/editpost/".$item['id'], t("Edit"));
|
||||
} else {
|
||||
$edpost = false;
|
||||
}
|
||||
|
|
|
@ -1,6 +1,7 @@
|
|||
<?php
|
||||
|
||||
use Friendica\App;
|
||||
use Friendica\Core\System;
|
||||
|
||||
require_once('mod/settings.php');
|
||||
|
||||
|
@ -20,7 +21,7 @@ function delegate_content(App $a) {
|
|||
// delegated admins can view but not change delegation permissions
|
||||
|
||||
if (x($_SESSION,'submanage') && intval($_SESSION['submanage'])) {
|
||||
goaway(App::get_baseurl() . '/delegate');
|
||||
goaway(System::baseUrl() . '/delegate');
|
||||
}
|
||||
|
||||
$id = $a->argv[2];
|
||||
|
@ -31,7 +32,7 @@ function delegate_content(App $a) {
|
|||
if (dbm::is_result($r)) {
|
||||
$r = q("select id from contact where uid = %d and nurl = '%s' limit 1",
|
||||
intval(local_user()),
|
||||
dbesc(normalise_link(App::get_baseurl() . '/profile/' . $r[0]['nickname']))
|
||||
dbesc(normalise_link(System::baseUrl() . '/profile/' . $r[0]['nickname']))
|
||||
);
|
||||
if (dbm::is_result($r)) {
|
||||
q("insert into manage ( uid, mid ) values ( %d , %d ) ",
|
||||
|
@ -40,21 +41,21 @@ function delegate_content(App $a) {
|
|||
);
|
||||
}
|
||||
}
|
||||
goaway(App::get_baseurl() . '/delegate');
|
||||
goaway(System::baseUrl() . '/delegate');
|
||||
}
|
||||
|
||||
if ($a->argc > 2 && $a->argv[1] === 'remove' && intval($a->argv[2])) {
|
||||
|
||||
// delegated admins can view but not change delegation permissions
|
||||
if (x($_SESSION,'submanage') && intval($_SESSION['submanage'])) {
|
||||
goaway(App::get_baseurl() . '/delegate');
|
||||
goaway(System::baseUrl() . '/delegate');
|
||||
}
|
||||
|
||||
q("DELETE FROM `manage` WHERE `uid` = %d AND `mid` = %d LIMIT 1",
|
||||
intval($a->argv[2]),
|
||||
intval(local_user())
|
||||
);
|
||||
goaway(App::get_baseurl() . '/delegate');
|
||||
goaway(System::baseUrl() . '/delegate');
|
||||
|
||||
}
|
||||
|
||||
|
@ -94,7 +95,7 @@ function delegate_content(App $a) {
|
|||
|
||||
$r = q("select nurl from contact where substring_index(contact.nurl,'/',3) = '%s'
|
||||
and contact.uid = %d and contact.self = 0 and network = '%s' ",
|
||||
dbesc(normalise_link(App::get_baseurl())),
|
||||
dbesc(normalise_link(System::baseUrl())),
|
||||
intval(local_user()),
|
||||
dbesc(NETWORK_DFRN)
|
||||
);
|
||||
|
@ -130,7 +131,7 @@ function delegate_content(App $a) {
|
|||
|
||||
$o = replace_macros(get_markup_template('delegate.tpl'),array(
|
||||
'$header' => t('Delegate Page Management'),
|
||||
'$base' => App::get_baseurl(),
|
||||
'$base' => System::baseUrl(),
|
||||
'$desc' => t('Delegates are able to manage all aspects of this account/page except for basic account settings. Please do not delegate your personal account to anybody that you do not trust completely.'),
|
||||
'$head_managers' => t('Existing Page Managers'),
|
||||
'$managers' => $full_managers,
|
||||
|
|
|
@ -19,6 +19,7 @@
|
|||
*/
|
||||
|
||||
use Friendica\App;
|
||||
use Friendica\Core\System;
|
||||
use Friendica\Network\Probe;
|
||||
|
||||
require_once 'include/enotify.php';
|
||||
|
@ -196,7 +197,7 @@ function dfrn_confirm_post(App $a, $handsfree = null) {
|
|||
$params['public_key'] = $public_key;
|
||||
|
||||
|
||||
$my_url = App::get_baseurl() . '/profile/' . $user[0]['nickname'];
|
||||
$my_url = System::baseUrl() . '/profile/' . $user[0]['nickname'];
|
||||
|
||||
openssl_public_encrypt($my_url, $params['source_url'], $site_pubkey);
|
||||
$params['source_url'] = bin2hex($params['source_url']);
|
||||
|
@ -507,7 +508,7 @@ function dfrn_confirm_post(App $a, $handsfree = null) {
|
|||
// do anything special with this new friend.
|
||||
|
||||
if ($handsfree === null) {
|
||||
goaway(App::get_baseurl() . '/contacts/' . intval($contact_id));
|
||||
goaway(System::baseUrl() . '/contacts/' . intval($contact_id));
|
||||
} else {
|
||||
return;
|
||||
}
|
||||
|
@ -669,7 +670,7 @@ function dfrn_confirm_post(App $a, $handsfree = null) {
|
|||
if (dbm::is_result($r)) {
|
||||
$photo = $r[0]['photo'];
|
||||
} else {
|
||||
$photo = App::get_baseurl() . '/images/person-175.jpg';
|
||||
$photo = System::baseUrl() . '/images/person-175.jpg';
|
||||
}
|
||||
|
||||
require_once 'include/Photo.php';
|
||||
|
@ -734,7 +735,7 @@ function dfrn_confirm_post(App $a, $handsfree = null) {
|
|||
'to_name' => $r[0]['username'],
|
||||
'to_email' => $r[0]['email'],
|
||||
'uid' => $r[0]['uid'],
|
||||
'link' => App::get_baseurl() . '/contacts/' . $dfrn_record,
|
||||
'link' => System::baseUrl() . '/contacts/' . $dfrn_record,
|
||||
'source_name' => ((strlen(stripslashes($r[0]['name']))) ? stripslashes($r[0]['name']) : t('[Name Withheld]')),
|
||||
'source_link' => $r[0]['url'],
|
||||
'source_photo' => $r[0]['photo'],
|
||||
|
@ -809,7 +810,7 @@ function dfrn_confirm_post(App $a, $handsfree = null) {
|
|||
|
||||
// somebody arrived here by mistake or they are fishing. Send them to the homepage.
|
||||
|
||||
goaway(z_root());
|
||||
goaway(System::baseUrl());
|
||||
// NOTREACHED
|
||||
|
||||
}
|
||||
|
|
|
@ -1,6 +1,7 @@
|
|||
<?php
|
||||
|
||||
use Friendica\App;
|
||||
use Friendica\Core\System;
|
||||
|
||||
require_once('include/items.php');
|
||||
require_once('include/auth.php');
|
||||
|
@ -77,7 +78,7 @@ function dfrn_poll_init(App $a) {
|
|||
$my_id = '0:' . $dfrn_id;
|
||||
break;
|
||||
default:
|
||||
goaway(z_root());
|
||||
goaway(System::baseUrl());
|
||||
break; // NOTREACHED
|
||||
}
|
||||
|
||||
|
@ -121,9 +122,9 @@ function dfrn_poll_init(App $a) {
|
|||
}
|
||||
}
|
||||
$profile = $r[0]['nickname'];
|
||||
goaway((strlen($destination_url)) ? $destination_url : App::get_baseurl() . '/profile/' . $profile);
|
||||
goaway((strlen($destination_url)) ? $destination_url : System::baseUrl() . '/profile/' . $profile);
|
||||
}
|
||||
goaway(z_root());
|
||||
goaway(System::baseUrl());
|
||||
|
||||
}
|
||||
|
||||
|
@ -321,7 +322,7 @@ function dfrn_poll_post(App $a) {
|
|||
$my_id = '0:' . $dfrn_id;
|
||||
break;
|
||||
default:
|
||||
goaway(z_root());
|
||||
goaway(System::baseUrl());
|
||||
break; // NOTREACHED
|
||||
}
|
||||
|
||||
|
@ -446,7 +447,7 @@ function dfrn_poll_content(App $a) {
|
|||
$my_id = '0:' . $dfrn_id;
|
||||
break;
|
||||
default:
|
||||
goaway(z_root());
|
||||
goaway(System::baseUrl());
|
||||
break; // NOTREACHED
|
||||
}
|
||||
|
||||
|
@ -510,14 +511,14 @@ function dfrn_poll_content(App $a) {
|
|||
|
||||
switch($destination_url) {
|
||||
case 'profile':
|
||||
$dest = App::get_baseurl() . '/profile/' . $profile . '?f=&tab=profile';
|
||||
$dest = System::baseUrl() . '/profile/' . $profile . '?f=&tab=profile';
|
||||
break;
|
||||
case 'photos':
|
||||
$dest = App::get_baseurl() . '/photos/' . $profile;
|
||||
$dest = System::baseUrl() . '/photos/' . $profile;
|
||||
break;
|
||||
case 'status':
|
||||
case '':
|
||||
$dest = App::get_baseurl() . '/profile/' . $profile;
|
||||
$dest = System::baseUrl() . '/profile/' . $profile;
|
||||
break;
|
||||
default:
|
||||
$appendix = (strstr($destination_url, '?') ? '&f=&redir=1' : '?f=&redir=1');
|
||||
|
|
|
@ -13,6 +13,7 @@
|
|||
*/
|
||||
|
||||
use Friendica\App;
|
||||
use Friendica\Core\System;
|
||||
use Friendica\Network\Probe;
|
||||
|
||||
require_once 'include/enotify.php';
|
||||
|
@ -53,7 +54,7 @@ function dfrn_request_post(App $a) {
|
|||
|
||||
|
||||
if(x($_POST, 'cancel')) {
|
||||
goaway(z_root());
|
||||
goaway(System::baseUrl());
|
||||
}
|
||||
|
||||
|
||||
|
@ -195,9 +196,9 @@ function dfrn_request_post(App $a) {
|
|||
if (isset($photo))
|
||||
update_contact_avatar($photo, local_user(), $r[0]["id"], true);
|
||||
|
||||
$forwardurl = App::get_baseurl()."/contacts/".$r[0]['id'];
|
||||
$forwardurl = System::baseUrl()."/contacts/".$r[0]['id'];
|
||||
} else {
|
||||
$forwardurl = App::get_baseurl()."/contacts";
|
||||
$forwardurl = System::baseUrl()."/contacts";
|
||||
}
|
||||
|
||||
/*
|
||||
|
@ -225,7 +226,7 @@ function dfrn_request_post(App $a) {
|
|||
// invalid/bogus request
|
||||
|
||||
notice( t('Unrecoverable protocol error.') . EOL );
|
||||
goaway(z_root());
|
||||
goaway(System::baseUrl());
|
||||
return; // NOTREACHED
|
||||
}
|
||||
|
||||
|
@ -506,19 +507,19 @@ function dfrn_request_post(App $a) {
|
|||
else {
|
||||
if (! validate_url($url)) {
|
||||
notice( t('Invalid profile URL.') . EOL);
|
||||
goaway(App::get_baseurl() . '/' . $a->cmd);
|
||||
goaway(System::baseUrl() . '/' . $a->cmd);
|
||||
return; // NOTREACHED
|
||||
}
|
||||
|
||||
if (! allowed_url($url)) {
|
||||
notice( t('Disallowed profile URL.') . EOL);
|
||||
goaway(App::get_baseurl() . '/' . $a->cmd);
|
||||
goaway(System::baseUrl() . '/' . $a->cmd);
|
||||
return; // NOTREACHED
|
||||
}
|
||||
|
||||
if (blocked_url($url)) {
|
||||
notice( t('Blocked domain') . EOL);
|
||||
goaway(App::get_baseurl() . '/' . $a->cmd);
|
||||
goaway(System::baseUrl() . '/' . $a->cmd);
|
||||
return; // NOTREACHED
|
||||
}
|
||||
|
||||
|
@ -526,7 +527,7 @@ function dfrn_request_post(App $a) {
|
|||
|
||||
if (! count($parms)) {
|
||||
notice( t('Profile location is not valid or does not contain profile information.') . EOL );
|
||||
goaway(App::get_baseurl() . '/' . $a->cmd);
|
||||
goaway(System::baseUrl() . '/' . $a->cmd);
|
||||
}
|
||||
else {
|
||||
if (! x($parms,'fn')) {
|
||||
|
@ -616,7 +617,7 @@ function dfrn_request_post(App $a) {
|
|||
|
||||
// "Homecoming" - send the requestor back to their site to record the introduction.
|
||||
|
||||
$dfrn_url = bin2hex(App::get_baseurl() . '/profile/' . $nickname);
|
||||
$dfrn_url = bin2hex(System::baseUrl() . '/profile/' . $nickname);
|
||||
$aes_allow = ((function_exists('openssl_encrypt')) ? 1 : 0);
|
||||
|
||||
goaway($parms['dfrn-request'] . "?dfrn_url=$dfrn_url"
|
||||
|
@ -645,7 +646,7 @@ function dfrn_request_post(App $a) {
|
|||
|
||||
$uri = urlencode($uri);
|
||||
} else {
|
||||
$uri = App::get_baseurl().'/profile/'.$nickname;
|
||||
$uri = System::baseUrl().'/profile/'.$nickname;
|
||||
}
|
||||
|
||||
$url = str_replace('{uri}', $uri, $url);
|
||||
|
@ -755,7 +756,7 @@ function dfrn_request_content(App $a) {
|
|||
'to_name' => $r[0]['username'],
|
||||
'to_email' => $r[0]['email'],
|
||||
'uid' => $r[0]['uid'],
|
||||
'link' => App::get_baseurl() . '/notifications/intros',
|
||||
'link' => System::baseUrl() . '/notifications/intros',
|
||||
'source_name' => ((strlen(stripslashes($r[0]['name']))) ? stripslashes($r[0]['name']) : t('[Name Withheld]')),
|
||||
'source_link' => $r[0]['url'],
|
||||
'source_photo' => $r[0]['photo'],
|
||||
|
@ -819,16 +820,16 @@ function dfrn_request_content(App $a) {
|
|||
$myaddr = $_GET['address'];
|
||||
} elseif (local_user()) {
|
||||
if (strlen($a->path)) {
|
||||
$myaddr = App::get_baseurl() . '/profile/' . $a->user['nickname'];
|
||||
$myaddr = System::baseUrl() . '/profile/' . $a->user['nickname'];
|
||||
} else {
|
||||
$myaddr = $a->user['nickname'] . '@' . substr(z_root(), strpos(z_root(),'://') + 3 );
|
||||
$myaddr = $a->user['nickname'] . '@' . substr(System::baseUrl(), strpos(System::baseUrl(),'://') + 3 );
|
||||
}
|
||||
} else {
|
||||
// last, try a zrl
|
||||
$myaddr = get_my_url();
|
||||
}
|
||||
|
||||
$target_addr = $a->profile['nickname'] . '@' . substr(z_root(), strpos(z_root(),'://') + 3 );
|
||||
$target_addr = $a->profile['nickname'] . '@' . substr(System::baseUrl(), strpos(System::baseUrl(),'://') + 3 );
|
||||
|
||||
|
||||
/*
|
||||
|
|
|
@ -1,6 +1,7 @@
|
|||
<?php
|
||||
|
||||
use Friendica\App;
|
||||
use Friendica\Core\System;
|
||||
|
||||
require_once 'include/contact_widgets.php';
|
||||
require_once 'include/probe.php';
|
||||
|
@ -205,7 +206,7 @@ function dirfind_content(App $a, $prefix = "") {
|
|||
$photo_menu = array();
|
||||
}
|
||||
} else {
|
||||
$connlnk = App::get_baseurl().'/follow/?url='.(($jj->connect) ? $jj->connect : $jj->url);
|
||||
$connlnk = System::baseUrl().'/follow/?url='.(($jj->connect) ? $jj->connect : $jj->url);
|
||||
$conntxt = t('Connect');
|
||||
$photo_menu = array(
|
||||
'profile' => array(t("View Profile"), zrl($jj->url)),
|
||||
|
|
|
@ -1,6 +1,7 @@
|
|||
<?php
|
||||
|
||||
use Friendica\App;
|
||||
use Friendica\Core\System;
|
||||
|
||||
require_once('include/dfrn.php');
|
||||
|
||||
|
@ -99,8 +100,8 @@ function display_init(App $a) {
|
|||
|
||||
$profiledata = display_fetchauthor($a, $r);
|
||||
|
||||
if (strstr(normalise_link($profiledata["url"]), normalise_link(App::get_baseurl()))) {
|
||||
$nickname = str_replace(normalise_link(App::get_baseurl())."/profile/", "", normalise_link($profiledata["url"]));
|
||||
if (strstr(normalise_link($profiledata["url"]), normalise_link(System::baseUrl()))) {
|
||||
$nickname = str_replace(normalise_link(System::baseUrl())."/profile/", "", normalise_link($profiledata["url"]));
|
||||
|
||||
if (($nickname != $a->user["nickname"])) {
|
||||
$r = dba::fetch_first("SELECT `profile`.`uid` AS `profile_uid`, `profile`.* , `contact`.`avatar-date` AS picdate, `user`.* FROM `profile`
|
||||
|
@ -197,11 +198,11 @@ function display_fetchauthor($a, $item) {
|
|||
|
||||
$profiledata = get_contact_details_by_url($profiledata["url"], local_user(), $profiledata);
|
||||
|
||||
$profiledata["photo"] = App::remove_baseurl($profiledata["photo"]);
|
||||
$profiledata["photo"] = System::removedBaseUrl($profiledata["photo"]);
|
||||
|
||||
if (local_user()) {
|
||||
if (in_array($profiledata["network"], array(NETWORK_DFRN, NETWORK_DIASPORA, NETWORK_OSTATUS))) {
|
||||
$profiledata["remoteconnect"] = App::get_baseurl()."/follow?url=".urlencode($profiledata["url"]);
|
||||
$profiledata["remoteconnect"] = System::baseUrl()."/follow?url=".urlencode($profiledata["url"]);
|
||||
}
|
||||
} elseif ($profiledata["network"] == NETWORK_DFRN) {
|
||||
$connect = str_replace("/profile/", "/dfrn_request/", $profiledata["url"]);
|
||||
|
@ -294,7 +295,7 @@ function display_content(App $a, $update = 0) {
|
|||
// We are displaying an "alternate" link if that post was public. See issue 2864
|
||||
$is_public = dba::exists('item', array('id' => $item_id, 'private' => false, 'wall' => true));
|
||||
if ($is_public) {
|
||||
$alternate = App::get_baseurl().'/display/'.$nick.'/'.$item_id.'.atom';
|
||||
$alternate = System::baseUrl().'/display/'.$nick.'/'.$item_id.'.atom';
|
||||
} else {
|
||||
$alternate = '';
|
||||
}
|
||||
|
|
|
@ -1,6 +1,7 @@
|
|||
<?php
|
||||
|
||||
use Friendica\App;
|
||||
use Friendica\Core\System;
|
||||
|
||||
require_once('include/acl_selectors.php');
|
||||
|
||||
|
@ -36,7 +37,7 @@ function editpost_content(App $a) {
|
|||
|
||||
$tpl = get_markup_template('jot-header.tpl');
|
||||
$a->page['htmlhead'] .= replace_macros($tpl, array(
|
||||
'$baseurl' => App::get_baseurl(),
|
||||
'$baseurl' => System::baseUrl(),
|
||||
'$ispublic' => ' ', // t('Visible to <strong>everybody</strong>'),
|
||||
'$geotag' => $geotag,
|
||||
'$nickname' => $a->user['nickname']
|
||||
|
@ -44,7 +45,7 @@ function editpost_content(App $a) {
|
|||
|
||||
$tpl = get_markup_template('jot-end.tpl');
|
||||
$a->page['end'] .= replace_macros($tpl, array(
|
||||
'$baseurl' => App::get_baseurl(),
|
||||
'$baseurl' => System::baseUrl(),
|
||||
'$ispublic' => ' ', // t('Visible to <strong>everybody</strong>'),
|
||||
'$geotag' => $geotag,
|
||||
'$nickname' => $a->user['nickname']
|
||||
|
@ -118,7 +119,7 @@ function editpost_content(App $a) {
|
|||
'$ptyp' => $itm[0]['type'],
|
||||
'$content' => undo_post_tagging($itm[0]['body']),
|
||||
'$post_id' => $post_id,
|
||||
'$baseurl' => App::get_baseurl(),
|
||||
'$baseurl' => System::baseUrl(),
|
||||
'$defloc' => $a->user['default-location'],
|
||||
'$visitor' => 'none',
|
||||
'$pvisit' => 'none',
|
||||
|
|
|
@ -5,6 +5,7 @@
|
|||
*/
|
||||
|
||||
use Friendica\App;
|
||||
use Friendica\Core\System;
|
||||
|
||||
require_once 'include/bbcode.php';
|
||||
require_once 'include/datetime.php';
|
||||
|
@ -90,7 +91,7 @@ function events_post(App $a) {
|
|||
$type = 'event';
|
||||
|
||||
$action = ($event_id == '') ? 'new' : "event/" . $event_id;
|
||||
$onerror_url = App::get_baseurl() . "/events/" . $action . "?summary=$summary&description=$desc&location=$location&start=$start_text&finish=$finish_text&adjust=$adjust&nofinish=$nofinish";
|
||||
$onerror_url = System::baseUrl() . "/events/" . $action . "?summary=$summary&description=$desc&location=$location&start=$start_text&finish=$finish_text&adjust=$adjust&nofinish=$nofinish";
|
||||
|
||||
if (strcmp($finish, $start) < 0 && !$nofinish) {
|
||||
notice(t('Event can not end before it has started.') . EOL);
|
||||
|
@ -190,7 +191,7 @@ function events_content(App $a) {
|
|||
}
|
||||
|
||||
if ($a->argc == 1) {
|
||||
$_SESSION['return_url'] = App::get_baseurl() . '/' . $a->cmd;
|
||||
$_SESSION['return_url'] = System::baseUrl() . '/' . $a->cmd;
|
||||
}
|
||||
|
||||
if (($a->argc > 2) && ($a->argv[1] === 'ignore') && intval($a->argv[2])) {
|
||||
|
@ -218,7 +219,7 @@ function events_content(App $a) {
|
|||
|
||||
$htpl = get_markup_template('event_head.tpl');
|
||||
$a->page['htmlhead'] .= replace_macros($htpl, array(
|
||||
'$baseurl' => App::get_baseurl(),
|
||||
'$baseurl' => System::baseUrl(),
|
||||
'$module_url' => '/events',
|
||||
'$modparams' => 1,
|
||||
'$i18n' => $i18n,
|
||||
|
@ -226,7 +227,7 @@ function events_content(App $a) {
|
|||
|
||||
$etpl = get_markup_template('event_end.tpl');
|
||||
$a->page['end'] .= replace_macros($etpl, array(
|
||||
'$baseurl' => App::get_baseurl(),
|
||||
'$baseurl' => System::baseUrl(),
|
||||
));
|
||||
|
||||
$o = '';
|
||||
|
@ -337,7 +338,7 @@ function events_content(App $a) {
|
|||
foreach ($r as $rr) {
|
||||
$j = (($rr['adjust']) ? datetime_convert('UTC', date_default_timezone_get(), $rr['start'], 'j') : datetime_convert('UTC', 'UTC', $rr['start'], 'j'));
|
||||
if (! x($links,$j)) {
|
||||
$links[$j] = App::get_baseurl() . '/' . $a->cmd . '#link-' . $j;
|
||||
$links[$j] = System::baseUrl() . '/' . $a->cmd . '#link-' . $j;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
@ -372,13 +373,13 @@ function events_content(App $a) {
|
|||
}
|
||||
|
||||
$o = replace_macros($tpl, array(
|
||||
'$baseurl' => App::get_baseurl(),
|
||||
'$baseurl' => System::baseUrl(),
|
||||
'$tabs' => $tabs,
|
||||
'$title' => t('Events'),
|
||||
'$view' => t('View'),
|
||||
'$new_event' => array(App::get_baseurl() . '/events/new', t('Create New Event'), '', ''),
|
||||
'$previous' => array(App::get_baseurl() . '/events/$prevyear/$prevmonth', t('Previous'), '', ''),
|
||||
'$next' => array(App::get_baseurl() . '/events/$nextyear/$nextmonth', t('Next'), '', ''),
|
||||
'$new_event' => array(System::baseUrl() . '/events/new', t('Create New Event'), '', ''),
|
||||
'$previous' => array(System::baseUrl() . '/events/$prevyear/$prevmonth', t('Previous'), '', ''),
|
||||
'$next' => array(System::baseUrl() . '/events/$nextyear/$nextmonth', t('Next'), '', ''),
|
||||
'$calendar' => cal($y, $m, $links, ' eventcal'),
|
||||
|
||||
'$events' => $events,
|
||||
|
@ -476,7 +477,7 @@ function events_content(App $a) {
|
|||
$tpl = get_markup_template('event_form.tpl');
|
||||
|
||||
$o .= replace_macros($tpl,array(
|
||||
'$post' => App::get_baseurl() . '/events',
|
||||
'$post' => System::baseUrl() . '/events',
|
||||
'$eid' => $eid,
|
||||
'$cid' => $cid,
|
||||
'$uri' => $uri,
|
||||
|
@ -533,6 +534,6 @@ function events_content(App $a) {
|
|||
info(t('Event removed') . EOL);
|
||||
}
|
||||
|
||||
goaway(App::get_baseurl() . '/events');
|
||||
goaway(System::baseUrl() . '/events');
|
||||
}
|
||||
}
|
||||
|
|
|
@ -6,6 +6,7 @@
|
|||
*/
|
||||
|
||||
use Friendica\App;
|
||||
use Friendica\Core\System;
|
||||
|
||||
require_once('include/Photo.php');
|
||||
|
||||
|
@ -84,9 +85,9 @@ function fbrowser_content(App $a) {
|
|||
$scale = $rr['loq'];
|
||||
|
||||
return array(
|
||||
App::get_baseurl() . '/photos/' . $a->user['nickname'] . '/image/' . $rr['resource-id'],
|
||||
System::baseUrl() . '/photos/' . $a->user['nickname'] . '/image/' . $rr['resource-id'],
|
||||
$filename_e,
|
||||
App::get_baseurl() . '/photo/' . $rr['resource-id'] . '-' . $scale . '.'. $ext
|
||||
System::baseUrl() . '/photo/' . $rr['resource-id'] . '-' . $scale . '.'. $ext
|
||||
);
|
||||
}
|
||||
$files = array_map("_map_files1", $r);
|
||||
|
@ -95,7 +96,7 @@ function fbrowser_content(App $a) {
|
|||
|
||||
$o = replace_macros($tpl, array(
|
||||
'$type' => 'image',
|
||||
'$baseurl' => App::get_baseurl(),
|
||||
'$baseurl' => System::baseUrl(),
|
||||
'$path' => $path,
|
||||
'$folders' => $albums,
|
||||
'$files' => $files,
|
||||
|
@ -122,7 +123,7 @@ function fbrowser_content(App $a) {
|
|||
$filename_e = $rr['filename'];
|
||||
}
|
||||
|
||||
return array( App::get_baseurl() . '/attach/' . $rr['id'], $filename_e, App::get_baseurl() . '/images/icons/16/' . $filetype . '.png');
|
||||
return array( System::baseUrl() . '/attach/' . $rr['id'], $filename_e, System::baseUrl() . '/images/icons/16/' . $filetype . '.png');
|
||||
}
|
||||
$files = array_map("_map_files2", $files);
|
||||
|
||||
|
@ -130,7 +131,7 @@ function fbrowser_content(App $a) {
|
|||
$tpl = get_markup_template($template_file);
|
||||
$o = replace_macros($tpl, array(
|
||||
'$type' => 'file',
|
||||
'$baseurl' => App::get_baseurl(),
|
||||
'$baseurl' => System::baseUrl(),
|
||||
'$path' => array( array( "", t("Files")) ),
|
||||
'$folders' => false,
|
||||
'$files' =>$files,
|
||||
|
|
|
@ -4,6 +4,7 @@ This file is part of the Diaspora protocol. It is used for fetching single publi
|
|||
*/
|
||||
|
||||
use Friendica\App;
|
||||
use Friendica\Core\System;
|
||||
|
||||
require_once("include/crypto.php");
|
||||
require_once("include/diaspora.php");
|
||||
|
@ -30,7 +31,7 @@ function fetch_init(App $a) {
|
|||
$parts = parse_url($r[0]["author-link"]);
|
||||
$host = $parts["scheme"]."://".$parts["host"];
|
||||
|
||||
if (normalise_link($host) != normalise_link(App::get_baseurl())) {
|
||||
if (normalise_link($host) != normalise_link(System::baseUrl())) {
|
||||
$location = $host."/fetch/".$a->argv[1]."/".urlencode($guid);
|
||||
|
||||
header("HTTP/1.1 301 Moved Permanently");
|
||||
|
|
|
@ -1,6 +1,7 @@
|
|||
<?php
|
||||
|
||||
use Friendica\App;
|
||||
use Friendica\Core\System;
|
||||
|
||||
function filerm_content(App $a) {
|
||||
|
||||
|
@ -25,7 +26,7 @@ function filerm_content(App $a) {
|
|||
}
|
||||
|
||||
if (x($_SESSION,'return_url')) {
|
||||
goaway(App::get_baseurl() . '/' . $_SESSION['return_url']);
|
||||
goaway(System::baseUrl() . '/' . $_SESSION['return_url']);
|
||||
}
|
||||
|
||||
killme();
|
||||
|
|
|
@ -1,6 +1,7 @@
|
|||
<?php
|
||||
|
||||
use Friendica\App;
|
||||
use Friendica\Core\System;
|
||||
|
||||
require_once 'include/probe.php';
|
||||
require_once 'include/follow.php';
|
||||
|
@ -66,7 +67,7 @@ function follow_content(App $a) {
|
|||
$request = $ret["request"];
|
||||
$tpl = get_markup_template('dfrn_request.tpl');
|
||||
} else {
|
||||
$request = App::get_baseurl()."/follow";
|
||||
$request = System::baseUrl()."/follow";
|
||||
$tpl = get_markup_template('auto_request.tpl');
|
||||
}
|
||||
|
||||
|
@ -182,13 +183,13 @@ function follow_post(App $a) {
|
|||
}
|
||||
goaway($return_url);
|
||||
} elseif ($result['cid']) {
|
||||
goaway(App::get_baseurl().'/contacts/'.$result['cid']);
|
||||
goaway(System::baseUrl().'/contacts/'.$result['cid']);
|
||||
}
|
||||
|
||||
info( t('Contact added').EOL);
|
||||
|
||||
if (strstr($return_url,'contacts')) {
|
||||
goaway(App::get_baseurl().'/contacts/'.$contact_id);
|
||||
goaway(System::baseUrl().'/contacts/'.$contact_id);
|
||||
}
|
||||
|
||||
goaway($return_url);
|
||||
|
|
|
@ -1,6 +1,7 @@
|
|||
<?php
|
||||
|
||||
use Friendica\App;
|
||||
use Friendica\Core\System;
|
||||
use Friendica\Core\Config;
|
||||
|
||||
function friendica_init(App $a) {
|
||||
|
@ -17,7 +18,7 @@ function friendica_init(App $a) {
|
|||
$r = q("SELECT `username`, `nickname` FROM `user` WHERE `email` = '%s' $sql_extra", dbesc($adminlist[0]));
|
||||
$admin = array(
|
||||
'name' => $r[0]['username'],
|
||||
'profile'=> App::get_baseurl() . '/profile/' . $r[0]['nickname'],
|
||||
'profile'=> System::baseUrl() . '/profile/' . $r[0]['nickname'],
|
||||
);
|
||||
} else {
|
||||
$admin = false;
|
||||
|
@ -47,7 +48,7 @@ function friendica_init(App $a) {
|
|||
|
||||
$data = Array(
|
||||
'version' => FRIENDICA_VERSION,
|
||||
'url' => z_root(),
|
||||
'url' => System::baseUrl(),
|
||||
'plugins' => $visible_plugins,
|
||||
'locked_features' => $locked_features,
|
||||
'register_policy' => $register_policy[$a->config['register_policy']],
|
||||
|
@ -55,7 +56,7 @@ function friendica_init(App $a) {
|
|||
'site_name' => $a->config['sitename'],
|
||||
'platform' => FRIENDICA_PLATFORM,
|
||||
'info' => ((x($a->config,'info')) ? $a->config['info'] : ''),
|
||||
'no_scrape_url' => App::get_baseurl().'/noscrape'
|
||||
'no_scrape_url' => System::baseUrl().'/noscrape'
|
||||
);
|
||||
|
||||
echo json_encode($data);
|
||||
|
@ -67,7 +68,7 @@ function friendica_content(App $a) {
|
|||
$o = '<h1>Friendica</h1>' . PHP_EOL;
|
||||
$o .= '<p>';
|
||||
$o .= t('This is Friendica, version') . ' <strong>' . FRIENDICA_VERSION . '</strong> ';
|
||||
$o .= t('running at web location') . ' ' . z_root();
|
||||
$o .= t('running at web location') . ' ' . System::baseUrl();
|
||||
$o .= '</p>' . PHP_EOL;
|
||||
|
||||
$o .= '<p>';
|
||||
|
|
|
@ -6,6 +6,7 @@
|
|||
*/
|
||||
|
||||
use Friendica\App;
|
||||
use Friendica\Core\System;
|
||||
|
||||
function group_init(App $a) {
|
||||
if (local_user()) {
|
||||
|
@ -30,12 +31,12 @@ function group_post(App $a) {
|
|||
info(t('Group created.') . EOL);
|
||||
$r = group_byname(local_user(), $name);
|
||||
if ($r) {
|
||||
goaway(App::get_baseurl() . '/group/' . $r);
|
||||
goaway(System::baseUrl() . '/group/' . $r);
|
||||
}
|
||||
} else {
|
||||
notice(t('Could not create group.') . EOL);
|
||||
}
|
||||
goaway(App::get_baseurl() . '/group');
|
||||
goaway(System::baseUrl() . '/group');
|
||||
return; // NOTREACHED
|
||||
}
|
||||
|
||||
|
@ -48,7 +49,7 @@ function group_post(App $a) {
|
|||
);
|
||||
if (! dbm::is_result($r)) {
|
||||
notice(t('Group not found.') . EOL);
|
||||
goaway(App::get_baseurl() . '/contacts');
|
||||
goaway(System::baseUrl() . '/contacts');
|
||||
return; // NOTREACHED
|
||||
}
|
||||
$group = $r[0];
|
||||
|
@ -126,7 +127,7 @@ function group_content(App $a) {
|
|||
notice(t('Unable to remove group.') . EOL);
|
||||
}
|
||||
}
|
||||
goaway(App::get_baseurl() . '/group');
|
||||
goaway(System::baseUrl() . '/group');
|
||||
// NOTREACHED
|
||||
}
|
||||
|
||||
|
@ -153,7 +154,7 @@ function group_content(App $a) {
|
|||
|
||||
if (! dbm::is_result($r)) {
|
||||
notice(t('Group not found.') . EOL);
|
||||
goaway(App::get_baseurl() . '/contacts');
|
||||
goaway(System::baseUrl() . '/contacts');
|
||||
}
|
||||
|
||||
$group = $r[0];
|
||||
|
|
|
@ -1,6 +1,7 @@
|
|||
<?php
|
||||
|
||||
use Friendica\App;
|
||||
use Friendica\Core\System;
|
||||
|
||||
function hcard_init(App $a) {
|
||||
|
||||
|
@ -43,14 +44,14 @@ function hcard_init(App $a) {
|
|||
}
|
||||
|
||||
$a->page['htmlhead'] .= '<meta name="dfrn-global-visibility" content="' . (($a->profile['net-publish']) ? 'true' : 'false') . '" />' . "\r\n" ;
|
||||
$a->page['htmlhead'] .= '<link rel="alternate" type="application/atom+xml" href="' . App::get_baseurl() . '/dfrn_poll/' . $which .'" />' . "\r\n" ;
|
||||
$a->page['htmlhead'] .= '<link rel="alternate" type="application/atom+xml" href="' . System::baseUrl() . '/dfrn_poll/' . $which .'" />' . "\r\n" ;
|
||||
$uri = urlencode('acct:' . $a->profile['nickname'] . '@' . $a->get_hostname() . (($a->path) ? '/' . $a->path : ''));
|
||||
$a->page['htmlhead'] .= '<link rel="lrdd" type="application/xrd+xml" href="' . App::get_baseurl() . '/xrd/?uri=' . $uri . '" />' . "\r\n";
|
||||
header('Link: <' . App::get_baseurl() . '/xrd/?uri=' . $uri . '>; rel="lrdd"; type="application/xrd+xml"', false);
|
||||
$a->page['htmlhead'] .= '<link rel="lrdd" type="application/xrd+xml" href="' . System::baseUrl() . '/xrd/?uri=' . $uri . '" />' . "\r\n";
|
||||
header('Link: <' . System::baseUrl() . '/xrd/?uri=' . $uri . '>; rel="lrdd"; type="application/xrd+xml"', false);
|
||||
|
||||
$dfrn_pages = array('request', 'confirm', 'notify', 'poll');
|
||||
foreach ($dfrn_pages as $dfrn) {
|
||||
$a->page['htmlhead'] .= "<link rel=\"dfrn-{$dfrn}\" href=\"".App::get_baseurl()."/dfrn_{$dfrn}/{$which}\" />\r\n";
|
||||
$a->page['htmlhead'] .= "<link rel=\"dfrn-{$dfrn}\" href=\"".System::baseUrl()."/dfrn_{$dfrn}/{$which}\" />\r\n";
|
||||
}
|
||||
|
||||
}
|
||||
|
|
|
@ -1,6 +1,7 @@
|
|||
<?php
|
||||
|
||||
use Friendica\App;
|
||||
use Friendica\Core\System;
|
||||
|
||||
require_once('library/markdown.php');
|
||||
|
||||
|
@ -80,7 +81,7 @@ function help_content(App $a) {
|
|||
if ($level>$lastlevel) $toc.="<ul>";
|
||||
$idnum[$level]++;
|
||||
$id = implode("_", array_slice($idnum,1,$level));
|
||||
$href = App::get_baseurl()."/help/{$filename}#{$id}";
|
||||
$href = System::baseUrl()."/help/{$filename}#{$id}";
|
||||
$toc .= "<li><a href='{$href}'>".strip_tags($line)."</a></li>";
|
||||
$line = "<a name='{$id}'></a>".$line;
|
||||
$lastlevel = $level;
|
||||
|
|
|
@ -1,6 +1,7 @@
|
|||
<?php
|
||||
|
||||
use Friendica\App;
|
||||
use Friendica\Core\System;
|
||||
|
||||
if(! function_exists('home_init')) {
|
||||
function home_init(App $a) {
|
||||
|
@ -9,11 +10,11 @@ function home_init(App $a) {
|
|||
call_hooks('home_init',$ret);
|
||||
|
||||
if (local_user() && ($a->user['nickname'])) {
|
||||
goaway(App::get_baseurl()."/network");
|
||||
goaway(System::baseUrl()."/network");
|
||||
}
|
||||
|
||||
if (strlen(get_config('system','singleuser'))) {
|
||||
goaway(App::get_baseurl()."/profile/" . get_config('system','singleuser'));
|
||||
goaway(System::baseUrl()."/profile/" . get_config('system','singleuser'));
|
||||
}
|
||||
|
||||
}}
|
||||
|
@ -33,7 +34,7 @@ function home_content(App $a) {
|
|||
/// @TODO No absolute path used, maybe risky (security)
|
||||
if (file_exists('home.html')) {
|
||||
if (file_exists('home.css')) {
|
||||
$a->page['htmlhead'] .= '<link rel="stylesheet" type="text/css" href="'.App::get_baseurl().'/home.css'.'" media="all" />';
|
||||
$a->page['htmlhead'] .= '<link rel="stylesheet" type="text/css" href="'.System::baseUrl().'/home.css'.'" media="all" />';
|
||||
}
|
||||
|
||||
$o .= file_get_contents('home.html');
|
||||
|
|
|
@ -1,6 +1,7 @@
|
|||
<?php
|
||||
|
||||
use Friendica\App;
|
||||
use Friendica\Core\System;
|
||||
|
||||
require_once('include/crypto.php');
|
||||
|
||||
|
@ -18,13 +19,13 @@ function hostxrd_init(App $a) {
|
|||
|
||||
//$tpl = file_get_contents('view/xrd_host.tpl');
|
||||
/*echo str_replace(array(
|
||||
'$zhost','$zroot','$domain','$zot_post','$bigkey'),array($a->get_hostname(),z_root(),z_path(),z_root() . '/post', salmon_key(get_config('system','site_pubkey'))),$tpl);*/
|
||||
'$zhost','$zroot','$domain','$zot_post','$bigkey'),array($a->get_hostname(),System::baseUrl(),System::baseUrl(),System::baseUrl() . '/post', salmon_key(get_config('system','site_pubkey'))),$tpl);*/
|
||||
$tpl = get_markup_template('xrd_host.tpl');
|
||||
echo replace_macros($tpl, array(
|
||||
'$zhost' => $a->get_hostname(),
|
||||
'$zroot' => z_root(),
|
||||
'$domain' => z_path(),
|
||||
'$zot_post' => z_root() . '/post',
|
||||
'$zroot' => System::baseUrl(),
|
||||
'$domain' => System::baseUrl(),
|
||||
'$zot_post' => System::baseUrl() . '/post',
|
||||
'$bigkey' => salmon_key(get_config('system','site_pubkey')),
|
||||
));
|
||||
exit();
|
||||
|
|
|
@ -1,6 +1,7 @@
|
|||
<?php
|
||||
|
||||
use Friendica\App;
|
||||
use Friendica\Core\System;
|
||||
|
||||
function ignored_init(App $a) {
|
||||
|
||||
|
@ -41,7 +42,7 @@ function ignored_init(App $a) {
|
|||
if(strpos($return_path, '?')) $rand = "&$rand";
|
||||
else $rand = "?$rand";
|
||||
|
||||
goaway(App::get_baseurl() . "/" . $return_path . $rand);
|
||||
goaway(System::baseUrl() . "/" . $return_path . $rand);
|
||||
}
|
||||
|
||||
// the json doesn't really matter, it will either be 0 or 1
|
||||
|
|
|
@ -1,6 +1,7 @@
|
|||
<?php
|
||||
|
||||
use Friendica\App;
|
||||
use Friendica\Core\System;
|
||||
|
||||
require_once "include/Photo.php";
|
||||
|
||||
|
@ -17,7 +18,7 @@ function install_init(App $a) {
|
|||
// We overwrite current theme css, because during install we could not have a working mod_rewrite
|
||||
// so we could not have a css at all. Here we set a static css file for the install procedure pages
|
||||
$a->config['system']['theme'] = "../install";
|
||||
$a->theme['stylesheet'] = App::get_baseurl()."/view/install/style.css";
|
||||
$a->theme['stylesheet'] = System::baseUrl()."/view/install/style.css";
|
||||
|
||||
global $install_wizard_pass;
|
||||
if (x($_POST, 'pass')) {
|
||||
|
@ -203,7 +204,7 @@ function install_content(App $a) {
|
|||
'$next' => t('Next'),
|
||||
'$reload' => t('Check again'),
|
||||
'$phpath' => $phpath,
|
||||
'$baseurl' => App::get_baseurl(),
|
||||
'$baseurl' => System::baseUrl(),
|
||||
));
|
||||
return $o;
|
||||
}; break;
|
||||
|
@ -237,7 +238,7 @@ function install_content(App $a) {
|
|||
|
||||
'$lbl_10' => t('Please select a default timezone for your website'),
|
||||
|
||||
'$baseurl' => App::get_baseurl(),
|
||||
'$baseurl' => System::baseUrl(),
|
||||
|
||||
'$phpath' => $phpath,
|
||||
|
||||
|
@ -277,7 +278,7 @@ function install_content(App $a) {
|
|||
|
||||
'$timezone' => field_timezone('timezone', t('Please select a default timezone for your website'), $timezone, ''),
|
||||
'$language' => array('language', t('System Language:'), 'en', t('Set the default language for your Friendica installation interface and to send emails.'), $lang_choices),
|
||||
'$baseurl' => App::get_baseurl(),
|
||||
'$baseurl' => System::baseUrl(),
|
||||
|
||||
|
||||
|
||||
|
@ -479,10 +480,10 @@ function check_htaccess(&$checks) {
|
|||
$status = true;
|
||||
$help = "";
|
||||
if (function_exists('curl_init')) {
|
||||
$test = fetch_url(App::get_baseurl()."/install/testrewrite");
|
||||
$test = fetch_url(System::baseUrl()."/install/testrewrite");
|
||||
|
||||
if ($test != "ok") {
|
||||
$test = fetch_url(normalise_link(App::get_baseurl()."/install/testrewrite"));
|
||||
$test = fetch_url(normalise_link(System::baseUrl()."/install/testrewrite"));
|
||||
}
|
||||
|
||||
if ($test != "ok") {
|
||||
|
@ -542,7 +543,7 @@ function load_database($db) {
|
|||
}
|
||||
|
||||
function what_next() {
|
||||
$baseurl = App::get_baseurl();
|
||||
$baseurl = System::baseUrl();
|
||||
return
|
||||
t('<h1>What next</h1>')
|
||||
."<p>".t('IMPORTANT: You will need to [manually] setup a scheduled task for the poller.')
|
||||
|
|
|
@ -8,6 +8,7 @@
|
|||
*/
|
||||
|
||||
use Friendica\App;
|
||||
use Friendica\Core\System;
|
||||
|
||||
require_once('include/email.php');
|
||||
|
||||
|
@ -123,7 +124,7 @@ function invite_content(App $a) {
|
|||
if ($a->config['register_policy'] == REGISTER_CLOSED) {
|
||||
$linktxt = sprintf( t('Visit %s for a list of public sites that you can join. Friendica members on other sites can all connect with each other, as well as with members of many other social networks.'), $dirloc . '/servers');
|
||||
} else {
|
||||
$linktxt = sprintf( t('To accept this invitation, please visit and register at %s or any other public Friendica website.'), App::get_baseurl())
|
||||
$linktxt = sprintf( t('To accept this invitation, please visit and register at %s or any other public Friendica website.'), System::baseUrl())
|
||||
. "\r\n" . "\r\n" . sprintf( t('Friendica sites all inter-connect to create a huge privacy-enhanced social web that is owned and controlled by its members. They can also connect with many traditional social networks. See %s for a list of alternate Friendica sites you can join.'),$dirloc . '/servers');
|
||||
}
|
||||
} else { // there is no global directory URL defined
|
||||
|
@ -131,7 +132,7 @@ function invite_content(App $a) {
|
|||
$o = t('Our apologies. This system is not currently configured to connect with other public sites or invite members.');
|
||||
return $o;
|
||||
} else {
|
||||
$linktxt = sprintf( t('To accept this invitation, please visit and register at %s.'), App::get_baseurl()
|
||||
$linktxt = sprintf( t('To accept this invitation, please visit and register at %s.'), System::baseUrl()
|
||||
. "\r\n" . "\r\n" . t('Friendica sites all inter-connect to create a huge privacy-enhanced social web that is owned and controlled by its members. They can also connect with many traditional social networks.'));
|
||||
}
|
||||
}
|
||||
|
@ -144,7 +145,7 @@ function invite_content(App $a) {
|
|||
'$default_message' => t('You are cordially invited to join me and other close friends on Friendica - and help us to create a better social web.') . "\r\n" . "\r\n"
|
||||
. $linktxt
|
||||
. "\r\n" . "\r\n" . (($invonly) ? t('You will need to supply this invitation code: $invite_code') . "\r\n" . "\r\n" : '') .t('Once you have registered, please connect with me via my profile page at:')
|
||||
. "\r\n" . "\r\n" . App::get_baseurl() . '/profile/' . $a->user['nickname']
|
||||
. "\r\n" . "\r\n" . System::baseUrl() . '/profile/' . $a->user['nickname']
|
||||
. "\r\n" . "\r\n" . t('For more information about the Friendica project and why we feel it is important, please visit http://friendi.ca') . "\r\n" . "\r\n" ,
|
||||
'$submit' => t('Submit')
|
||||
));
|
||||
|
|
21
mod/item.php
21
mod/item.php
|
@ -16,6 +16,7 @@
|
|||
*/
|
||||
|
||||
use Friendica\App;
|
||||
use Friendica\Core\System;
|
||||
|
||||
require_once 'include/crypto.php';
|
||||
require_once 'include/enotify.php';
|
||||
|
@ -66,7 +67,7 @@ function item_post(App $a) {
|
|||
if (!$preview && x($_REQUEST, 'post_id_random')) {
|
||||
if (x($_SESSION, 'post-random') && $_SESSION['post-random'] == $_REQUEST['post_id_random']) {
|
||||
logger("item post: duplicate post", LOGGER_DEBUG);
|
||||
item_post_return(App::get_baseurl(), $api_source, $return_path);
|
||||
item_post_return(System::baseUrl(), $api_source, $return_path);
|
||||
} else {
|
||||
$_SESSION['post-random'] = $_REQUEST['post_id_random'];
|
||||
}
|
||||
|
@ -436,7 +437,7 @@ function item_post(App $a) {
|
|||
$objecttype = ACTIVITY_OBJ_IMAGE;
|
||||
|
||||
foreach ($images as $image) {
|
||||
if (! stristr($image,App::get_baseurl() . '/photo/')) {
|
||||
if (! stristr($image,System::baseUrl() . '/photo/')) {
|
||||
continue;
|
||||
}
|
||||
$image_uri = substr($image,strrpos($image,'/') + 1);
|
||||
|
@ -625,7 +626,7 @@ function item_post(App $a) {
|
|||
if (strlen($attachments)) {
|
||||
$attachments .= ',';
|
||||
}
|
||||
$attachments .= '[attach]href="' . App::get_baseurl() . '/attach/' . $r[0]['id'] . '" length="' . $r[0]['filesize'] . '" type="' . $r[0]['filetype'] . '" title="' . (($r[0]['filename']) ? $r[0]['filename'] : '') . '"[/attach]';
|
||||
$attachments .= '[attach]href="' . System::baseUrl() . '/attach/' . $r[0]['id'] . '" length="' . $r[0]['filesize'] . '" type="' . $r[0]['filetype'] . '" title="' . (($r[0]['filename']) ? $r[0]['filename'] : '') . '"[/attach]';
|
||||
}
|
||||
$body = str_replace($match[1],'',$body);
|
||||
}
|
||||
|
@ -720,7 +721,7 @@ function item_post(App $a) {
|
|||
// $datarray['prvnets'] = $user['prvnets'];
|
||||
|
||||
$datarray['parent-uri'] = ($parent == 0) ? $uri : $parent_item['uri'];
|
||||
$datarray['plink'] = App::get_baseurl() . '/display/' . urlencode($datarray['guid']);
|
||||
$datarray['plink'] = System::baseUrl() . '/display/' . urlencode($datarray['guid']);
|
||||
$datarray['last-child'] = 1;
|
||||
$datarray['visible'] = 1;
|
||||
|
||||
|
@ -765,7 +766,7 @@ function item_post(App $a) {
|
|||
|
||||
$json = array('cancel' => 1);
|
||||
if (x($_REQUEST, 'jsreload') && strlen($_REQUEST['jsreload'])) {
|
||||
$json['reload'] = App::get_baseurl() . '/' . $_REQUEST['jsreload'];
|
||||
$json['reload'] = System::baseUrl() . '/' . $_REQUEST['jsreload'];
|
||||
}
|
||||
|
||||
echo json_encode($json);
|
||||
|
@ -935,7 +936,7 @@ function item_post(App $a) {
|
|||
'to_email' => $user['email'],
|
||||
'uid' => $user['uid'],
|
||||
'item' => $datarray,
|
||||
'link' => App::get_baseurl().'/display/'.urlencode($datarray['guid']),
|
||||
'link' => System::baseUrl().'/display/'.urlencode($datarray['guid']),
|
||||
'source_name' => $datarray['author-name'],
|
||||
'source_link' => $datarray['author-link'],
|
||||
'source_photo' => $datarray['author-avatar'],
|
||||
|
@ -967,7 +968,7 @@ function item_post(App $a) {
|
|||
'to_email' => $user['email'],
|
||||
'uid' => $user['uid'],
|
||||
'item' => $datarray,
|
||||
'link' => App::get_baseurl().'/display/'.urlencode($datarray['guid']),
|
||||
'link' => System::baseUrl().'/display/'.urlencode($datarray['guid']),
|
||||
'source_name' => $datarray['author-name'],
|
||||
'source_link' => $datarray['author-link'],
|
||||
'source_photo' => $datarray['author-avatar'],
|
||||
|
@ -989,14 +990,14 @@ function item_post(App $a) {
|
|||
}
|
||||
$disclaimer = '<hr />' . sprintf( t('This message was sent to you by %s, a member of the Friendica social network.'), $a->user['username'])
|
||||
. '<br />';
|
||||
$disclaimer .= sprintf( t('You may visit them online at %s'), App::get_baseurl() . '/profile/' . $a->user['nickname']) . EOL;
|
||||
$disclaimer .= sprintf( t('You may visit them online at %s'), System::baseUrl() . '/profile/' . $a->user['nickname']) . EOL;
|
||||
$disclaimer .= t('Please contact the sender by replying to this post if you do not wish to receive these messages.') . EOL;
|
||||
if (!$datarray['title']=='') {
|
||||
$subject = email_header_encode($datarray['title'], 'UTF-8');
|
||||
} else {
|
||||
$subject = email_header_encode('[Friendica]' . ' ' . sprintf( t('%s posted an update.'), $a->user['username']), 'UTF-8');
|
||||
}
|
||||
$link = '<a href="' . App::get_baseurl() . '/profile/' . $a->user['nickname'] . '"><img src="' . $author['thumb'] . '" alt="' . $a->user['username'] . '" /></a><br /><br />';
|
||||
$link = '<a href="' . System::baseUrl() . '/profile/' . $a->user['nickname'] . '"><img src="' . $author['thumb'] . '" alt="' . $a->user['username'] . '" /></a><br /><br />';
|
||||
$html = prepare_body($datarray);
|
||||
$message = '<html><body>' . $link . $html . $disclaimer . '</body></html>';
|
||||
include_once 'include/html2plain.php';
|
||||
|
@ -1036,7 +1037,7 @@ function item_post(App $a) {
|
|||
|
||||
logger('post_complete');
|
||||
|
||||
item_post_return(App::get_baseurl(), $api_source, $return_path);
|
||||
item_post_return(System::baseUrl(), $api_source, $return_path);
|
||||
// NOTREACHED
|
||||
}
|
||||
|
||||
|
|
|
@ -1,6 +1,7 @@
|
|||
<?php
|
||||
|
||||
use Friendica\App;
|
||||
use Friendica\Core\System;
|
||||
|
||||
require_once('include/security.php');
|
||||
require_once('include/bbcode.php');
|
||||
|
@ -26,7 +27,7 @@ function like_content(App $a) {
|
|||
// See if we've been passed a return path to redirect to
|
||||
$return_path = ((x($_REQUEST,'return')) ? $_REQUEST['return'] : '');
|
||||
|
||||
like_content_return(App::get_baseurl(), $return_path);
|
||||
like_content_return(System::baseUrl(), $return_path);
|
||||
killme(); // NOTREACHED
|
||||
// return; // NOTREACHED
|
||||
}
|
||||
|
|
|
@ -1,6 +1,7 @@
|
|||
<?php
|
||||
|
||||
use Friendica\App;
|
||||
use Friendica\Core\System;
|
||||
|
||||
require_once('include/datetime.php');
|
||||
|
||||
|
@ -37,7 +38,7 @@ function localtime_content(App $a) {
|
|||
$o .= '<p>' . sprintf( t('Converted localtime: %s'),$a->data['mod-localtime']) . '</p>';
|
||||
|
||||
|
||||
$o .= '<form action ="' . App::get_baseurl() . '/localtime?f=&time=' . $t . '" method="post" >';
|
||||
$o .= '<form action ="' . System::baseUrl() . '/localtime?f=&time=' . $t . '" method="post" >';
|
||||
|
||||
$o .= '<p>' . t('Please select your timezone:') . '</p>';
|
||||
|
||||
|
@ -47,4 +48,4 @@ function localtime_content(App $a) {
|
|||
|
||||
return $o;
|
||||
|
||||
}
|
||||
}
|
||||
|
|
|
@ -1,6 +1,7 @@
|
|||
<?php
|
||||
|
||||
use Friendica\App;
|
||||
use Friendica\Core\System;
|
||||
|
||||
function login_content(App $a) {
|
||||
if (x($_SESSION, 'theme')) {
|
||||
|
@ -12,7 +13,7 @@ function login_content(App $a) {
|
|||
}
|
||||
|
||||
if (local_user()) {
|
||||
goaway(z_root());
|
||||
goaway(System::baseUrl());
|
||||
}
|
||||
|
||||
return login(($a->config['register_policy'] == REGISTER_CLOSED) ? false : true);
|
||||
|
|
|
@ -1,6 +1,7 @@
|
|||
<?php
|
||||
|
||||
use Friendica\App;
|
||||
use Friendica\Core\System;
|
||||
|
||||
require_once('include/email.php');
|
||||
require_once('include/enotify.php');
|
||||
|
@ -10,7 +11,7 @@ function lostpass_post(App $a) {
|
|||
|
||||
$loginame = notags(trim($_POST['login-name']));
|
||||
if(! $loginame)
|
||||
goaway(z_root());
|
||||
goaway(System::baseUrl());
|
||||
|
||||
$r = q("SELECT * FROM `user` WHERE ( `email` = '%s' OR `nickname` = '%s' ) AND `verified` = 1 AND `blocked` = 0 LIMIT 1",
|
||||
dbesc($loginame),
|
||||
|
@ -19,7 +20,7 @@ function lostpass_post(App $a) {
|
|||
|
||||
if (! dbm::is_result($r)) {
|
||||
notice( t('No valid account found.') . EOL);
|
||||
goaway(z_root());
|
||||
goaway(System::baseUrl());
|
||||
}
|
||||
|
||||
$uid = $r[0]['uid'];
|
||||
|
@ -38,7 +39,7 @@ function lostpass_post(App $a) {
|
|||
|
||||
|
||||
$sitename = $a->config['sitename'];
|
||||
$resetlink = App::get_baseurl() . '/lostpass?verify=' . $new_password;
|
||||
$resetlink = System::baseUrl() . '/lostpass?verify=' . $new_password;
|
||||
|
||||
$preamble = deindent(t('
|
||||
Dear %1$s,
|
||||
|
@ -65,7 +66,7 @@ function lostpass_post(App $a) {
|
|||
Login Name: %3$s'));
|
||||
|
||||
$preamble = sprintf($preamble, $username, $sitename);
|
||||
$body = sprintf($body, $resetlink, App::get_baseurl(), $email);
|
||||
$body = sprintf($body, $resetlink, System::baseUrl(), $email);
|
||||
|
||||
notification(array(
|
||||
'type' => "SYSTEM_EMAIL",
|
||||
|
@ -74,7 +75,7 @@ function lostpass_post(App $a) {
|
|||
'preamble'=> $preamble,
|
||||
'body' => $body));
|
||||
|
||||
goaway(z_root());
|
||||
goaway(System::baseUrl());
|
||||
|
||||
}
|
||||
|
||||
|
@ -113,10 +114,10 @@ function lostpass_content(App $a) {
|
|||
'$lbl2' => t('Your password has been reset as requested.'),
|
||||
'$lbl3' => t('Your new password is'),
|
||||
'$lbl4' => t('Save or copy your new password - and then'),
|
||||
'$lbl5' => '<a href="' . App::get_baseurl() . '">' . t('click here to login') . '</a>.',
|
||||
'$lbl5' => '<a href="' . System::baseUrl() . '">' . t('click here to login') . '</a>.',
|
||||
'$lbl6' => t('Your password may be changed from the <em>Settings</em> page after successful login.'),
|
||||
'$newpass' => $new_password,
|
||||
'$baseurl' => App::get_baseurl()
|
||||
'$baseurl' => System::baseUrl()
|
||||
|
||||
));
|
||||
info("Your password has been reset." . EOL);
|
||||
|
@ -141,7 +142,7 @@ function lostpass_content(App $a) {
|
|||
'));
|
||||
|
||||
$preamble = sprintf($preamble, $username);
|
||||
$body = sprintf($body, App::get_baseurl(), $email, $new_password);
|
||||
$body = sprintf($body, System::baseUrl(), $email, $new_password);
|
||||
|
||||
notification(array(
|
||||
'type' => "SYSTEM_EMAIL",
|
||||
|
|
|
@ -1,6 +1,7 @@
|
|||
<?php
|
||||
|
||||
use Friendica\App;
|
||||
use Friendica\Core\System;
|
||||
|
||||
require_once("include/text.php");
|
||||
|
||||
|
@ -91,7 +92,7 @@ function manage_post(App $a) {
|
|||
$ret = array();
|
||||
call_hooks('home_init',$ret);
|
||||
|
||||
goaway( App::get_baseurl() . "/profile/" . $a->user['nickname'] );
|
||||
goaway( System::baseUrl() . "/profile/" . $a->user['nickname'] );
|
||||
// NOTREACHED
|
||||
}
|
||||
|
||||
|
|
|
@ -1,6 +1,7 @@
|
|||
<?php
|
||||
|
||||
use Friendica\App;
|
||||
use Friendica\Core\System;
|
||||
use Friendica\Core\Config;
|
||||
|
||||
function manifest_content(App $a) {
|
||||
|
@ -15,7 +16,7 @@ function manifest_content(App $a) {
|
|||
}
|
||||
|
||||
$o = replace_macros($tpl, array(
|
||||
'$baseurl' => App::get_baseurl(),
|
||||
'$baseurl' => System::baseUrl(),
|
||||
'$touch_icon' => $touch_icon,
|
||||
'$title' => Config::get('config', 'sitename', 'Friendica'),
|
||||
));
|
||||
|
|
|
@ -1,6 +1,7 @@
|
|||
<?php
|
||||
|
||||
use Friendica\App;
|
||||
use Friendica\Core\System;
|
||||
|
||||
require_once('include/text.php');
|
||||
require_once('include/socgraph.php');
|
||||
|
@ -26,7 +27,7 @@ function match_content(App $a) {
|
|||
$a->page['aside'] .= findpeople_widget();
|
||||
$a->page['aside'] .= follow_widget();
|
||||
|
||||
$_SESSION['return_url'] = App::get_baseurl() . '/' . $a->cmd;
|
||||
$_SESSION['return_url'] = System::baseUrl() . '/' . $a->cmd;
|
||||
|
||||
$r = q("SELECT `pub_keywords`, `prv_keywords` FROM `profile` WHERE `is-default` = 1 AND `uid` = %d LIMIT 1",
|
||||
intval(local_user())
|
||||
|
@ -50,7 +51,7 @@ function match_content(App $a) {
|
|||
if(strlen(get_config('system','directory')))
|
||||
$x = post_url(get_server().'/msearch', $params);
|
||||
else
|
||||
$x = post_url(App::get_baseurl() . '/msearch', $params);
|
||||
$x = post_url(System::baseUrl() . '/msearch', $params);
|
||||
|
||||
$j = json_decode($x);
|
||||
|
||||
|
@ -71,7 +72,7 @@ function match_content(App $a) {
|
|||
|
||||
if (!count($match)) {
|
||||
$jj->photo = str_replace("http:///photo/", get_server()."/photo/", $jj->photo);
|
||||
$connlnk = App::get_baseurl() . '/follow/?url=' . $jj->url;
|
||||
$connlnk = System::baseUrl() . '/follow/?url=' . $jj->url;
|
||||
$photo_menu = array(
|
||||
'profile' => array(t("View Profile"), zrl($jj->url)),
|
||||
'follow' => array(t("Connect/Follow"), $connlnk)
|
||||
|
|
|
@ -1,6 +1,7 @@
|
|||
<?php
|
||||
|
||||
use Friendica\App;
|
||||
use Friendica\Core\System;
|
||||
|
||||
require_once('include/acl_selectors.php');
|
||||
require_once('include/message.php');
|
||||
|
@ -26,17 +27,17 @@ function message_init(App $a) {
|
|||
'$tabs'=>$tabs,
|
||||
'$new'=>$new,
|
||||
));
|
||||
$base = App::get_baseurl();
|
||||
$base = System::baseUrl();
|
||||
|
||||
$head_tpl = get_markup_template('message-head.tpl');
|
||||
$a->page['htmlhead'] .= replace_macros($head_tpl,array(
|
||||
'$baseurl' => App::get_baseurl(true),
|
||||
'$baseurl' => System::baseUrl(true),
|
||||
'$base' => $base
|
||||
));
|
||||
|
||||
$end_tpl = get_markup_template('message-end.tpl');
|
||||
$a->page['end'] .= replace_macros($end_tpl,array(
|
||||
'$baseurl' => App::get_baseurl(true),
|
||||
'$baseurl' => System::baseUrl(true),
|
||||
'$base' => $base
|
||||
));
|
||||
|
||||
|
@ -138,7 +139,7 @@ function item_redir_and_replace_images($body, $images, $cid) {
|
|||
|
||||
for($i = 0; $i < count($images); $i++) {
|
||||
$search = '/\[url\=(.*?)\]\[!#saved_image' . $i . '#!\]\[\/url\]' . '/is';
|
||||
$replace = '[url=' . z_path() . '/redir/' . $cid
|
||||
$replace = '[url=' . System::baseUrl() . '/redir/' . $cid
|
||||
. '?f=1&url=' . '$1' . '][!#saved_image' . $i . '#!][/url]' ;
|
||||
|
||||
$img_end = strpos($origbody, '[!#saved_image' . $i . '#!][/url]') + strlen('[!#saved_image' . $i . '#!][/url]');
|
||||
|
@ -174,7 +175,7 @@ function message_content(App $a) {
|
|||
return;
|
||||
}
|
||||
|
||||
$myprofile = App::get_baseurl().'/profile/' . $a->user['nickname'];
|
||||
$myprofile = System::baseUrl().'/profile/' . $a->user['nickname'];
|
||||
|
||||
$tpl = get_markup_template('mail_head.tpl');
|
||||
$header = replace_macros($tpl, array(
|
||||
|
@ -225,7 +226,7 @@ function message_content(App $a) {
|
|||
if ($r) {
|
||||
info( t('Message deleted.') . EOL );
|
||||
}
|
||||
//goaway(App::get_baseurl(true) . '/message' );
|
||||
//goaway(System::baseUrl(true) . '/message' );
|
||||
goaway($_SESSION['return_url']);
|
||||
}
|
||||
else {
|
||||
|
@ -256,7 +257,7 @@ function message_content(App $a) {
|
|||
if($r)
|
||||
info( t('Conversation removed.') . EOL );
|
||||
}
|
||||
//goaway(App::get_baseurl(true) . '/message' );
|
||||
//goaway(System::baseUrl(true) . '/message' );
|
||||
goaway($_SESSION['return_url']);
|
||||
}
|
||||
|
||||
|
@ -268,14 +269,14 @@ function message_content(App $a) {
|
|||
|
||||
$tpl = get_markup_template('msg-header.tpl');
|
||||
$a->page['htmlhead'] .= replace_macros($tpl, array(
|
||||
'$baseurl' => App::get_baseurl(true),
|
||||
'$baseurl' => System::baseUrl(true),
|
||||
'$nickname' => $a->user['nickname'],
|
||||
'$linkurl' => t('Please enter a link URL:')
|
||||
));
|
||||
|
||||
$tpl = get_markup_template('msg-end.tpl');
|
||||
$a->page['end'] .= replace_macros($tpl, array(
|
||||
'$baseurl' => App::get_baseurl(true),
|
||||
'$baseurl' => System::baseUrl(true),
|
||||
'$nickname' => $a->user['nickname'],
|
||||
'$linkurl' => t('Please enter a link URL:')
|
||||
));
|
||||
|
@ -415,14 +416,14 @@ function message_content(App $a) {
|
|||
|
||||
$tpl = get_markup_template('msg-header.tpl');
|
||||
$a->page['htmlhead'] .= replace_macros($tpl, array(
|
||||
'$baseurl' => App::get_baseurl(true),
|
||||
'$baseurl' => System::baseUrl(true),
|
||||
'$nickname' => $a->user['nickname'],
|
||||
'$linkurl' => t('Please enter a link URL:')
|
||||
));
|
||||
|
||||
$tpl = get_markup_template('msg-end.tpl');
|
||||
$a->page['end'] .= replace_macros($tpl, array(
|
||||
'$baseurl' => App::get_baseurl(true),
|
||||
'$baseurl' => System::baseUrl(true),
|
||||
'$nickname' => $a->user['nickname'],
|
||||
'$linkurl' => t('Please enter a link URL:')
|
||||
));
|
||||
|
@ -555,7 +556,7 @@ function render_messages(array $msg, $t) {
|
|||
$tpl = get_markup_template($t);
|
||||
$rslt = '';
|
||||
|
||||
$myprofile = App::get_baseurl().'/profile/' . $a->user['nickname'];
|
||||
$myprofile = System::baseUrl().'/profile/' . $a->user['nickname'];
|
||||
|
||||
foreach($msg as $rr) {
|
||||
|
||||
|
|
|
@ -1,6 +1,7 @@
|
|||
<?php
|
||||
|
||||
use Friendica\App;
|
||||
use Friendica\Core\System;
|
||||
|
||||
require_once('include/security.php');
|
||||
require_once('include/bbcode.php');
|
||||
|
@ -93,7 +94,7 @@ function mood_init(App $a) {
|
|||
$item_id = item_store($arr);
|
||||
if($item_id) {
|
||||
q("UPDATE `item` SET `plink` = '%s' WHERE `uid` = %d AND `id` = %d",
|
||||
dbesc(App::get_baseurl() . '/display/' . $poster['nickname'] . '/' . $item_id),
|
||||
dbesc(System::baseUrl() . '/display/' . $poster['nickname'] . '/' . $item_id),
|
||||
intval($uid),
|
||||
intval($item_id)
|
||||
);
|
||||
|
|
|
@ -1,6 +1,7 @@
|
|||
<?php
|
||||
|
||||
use Friendica\App;
|
||||
use Friendica\Core\System;
|
||||
|
||||
function msearch_post(App $a) {
|
||||
|
||||
|
@ -31,8 +32,8 @@ function msearch_post(App $a) {
|
|||
foreach($r as $rr)
|
||||
$results[] = array(
|
||||
'name' => $rr['name'],
|
||||
'url' => App::get_baseurl() . '/profile/' . $rr['nickname'],
|
||||
'photo' => App::get_baseurl() . '/photo/avatar/' . $rr['uid'] . '.jpg',
|
||||
'url' => System::baseUrl() . '/profile/' . $rr['nickname'],
|
||||
'photo' => System::baseUrl() . '/photo/avatar/' . $rr['uid'] . '.jpg',
|
||||
'tags' => str_replace(array(',',' '),array(' ',' '),$rr['pub_keywords'])
|
||||
);
|
||||
}
|
||||
|
|
|
@ -1,6 +1,7 @@
|
|||
<?php
|
||||
|
||||
use Friendica\App;
|
||||
use Friendica\Core\System;
|
||||
|
||||
require_once("include/nav.php");
|
||||
|
||||
|
@ -14,7 +15,7 @@ function navigation_content(App $a) {
|
|||
|
||||
$tpl = get_markup_template('navigation.tpl');
|
||||
return replace_macros($tpl, array(
|
||||
'$baseurl' => App::get_baseurl(),
|
||||
'$baseurl' => System::baseUrl(),
|
||||
'$sitelocation' => $nav_info['sitelocation'],
|
||||
'$nav' => $nav_info['nav'],
|
||||
'$banner' => $nav_info['banner'],
|
||||
|
|
|
@ -1,6 +1,7 @@
|
|||
<?php
|
||||
|
||||
use Friendica\App;
|
||||
use Friendica\Core\System;
|
||||
|
||||
function network_init(App $a) {
|
||||
if (! local_user()) {
|
||||
|
@ -105,7 +106,7 @@ function network_init(App $a) {
|
|||
|
||||
$redir_url = ($net_queries ? $net_baseurl."?".$net_queries : $net_baseurl);
|
||||
|
||||
goaway(App::get_baseurl() . $redir_url);
|
||||
goaway(System::baseUrl() . $redir_url);
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
@ -6,13 +6,14 @@
|
|||
*/
|
||||
|
||||
use Friendica\App;
|
||||
use Friendica\Core\System;
|
||||
use Friendica\Core\Config;
|
||||
|
||||
require_once 'include/plugin.php';
|
||||
|
||||
function nodeinfo_wellknown(App $a) {
|
||||
$nodeinfo = array('links' => array(array('rel' => 'http://nodeinfo.diaspora.software/ns/schema/1.0',
|
||||
'href' => App::get_baseurl().'/nodeinfo/1.0')));
|
||||
'href' => System::baseUrl().'/nodeinfo/1.0')));
|
||||
|
||||
header('Content-type: application/json; charset=utf-8');
|
||||
echo json_encode($nodeinfo, JSON_PRETTY_PRINT|JSON_UNESCAPED_SLASHES);
|
||||
|
|
|
@ -1,6 +1,7 @@
|
|||
<?php
|
||||
|
||||
use Friendica\App;
|
||||
use Friendica\Core\System;
|
||||
|
||||
function noscrape_init(App $a) {
|
||||
|
||||
|
@ -36,7 +37,7 @@ function noscrape_init(App $a) {
|
|||
'addr' => $a->profile['addr'],
|
||||
'nick' => $which,
|
||||
'key' => $a->profile['pubkey'],
|
||||
'homepage' => App::get_baseurl()."/profile/{$which}",
|
||||
'homepage' => System::baseUrl()."/profile/{$which}",
|
||||
'comm' => (x($a->profile,'page-flags')) && ($a->profile['page-flags'] == PAGE_COMMUNITY),
|
||||
'photo' => $r[0]["photo"],
|
||||
'tags' => $keywords
|
||||
|
@ -71,7 +72,7 @@ function noscrape_init(App $a) {
|
|||
|
||||
$dfrn_pages = array('request', 'confirm', 'notify', 'poll');
|
||||
foreach ($dfrn_pages as $dfrn) {
|
||||
$json_info["dfrn-{$dfrn}"] = App::get_baseurl()."/dfrn_{$dfrn}/{$which}";
|
||||
$json_info["dfrn-{$dfrn}"] = System::baseUrl()."/dfrn_{$dfrn}/{$which}";
|
||||
}
|
||||
|
||||
//Output all the JSON!
|
||||
|
|
|
@ -3,6 +3,7 @@
|
|||
/* identi.ca -> friendica items permanent-url compatibility */
|
||||
|
||||
use Friendica\App;
|
||||
use Friendica\Core\System;
|
||||
|
||||
function notice_init(App $a) {
|
||||
|
||||
|
@ -10,7 +11,7 @@ function notice_init(App $a) {
|
|||
$r = q("SELECT `user`.`nickname` FROM `user` LEFT JOIN `item` ON `item`.`uid` = `user`.`uid` WHERE `item`.`id` = %d", intval($id));
|
||||
if (dbm::is_result($r)) {
|
||||
$nick = $r[0]['nickname'];
|
||||
$url = App::get_baseurl() . "/display/$nick/$id";
|
||||
$url = System::baseUrl() . "/display/$nick/$id";
|
||||
goaway($url);
|
||||
} else {
|
||||
$a->error = 404;
|
||||
|
|
|
@ -6,6 +6,7 @@
|
|||
*/
|
||||
|
||||
use Friendica\App;
|
||||
use Friendica\Core\System;
|
||||
|
||||
require_once("include/NotificationsManager.php");
|
||||
require_once("include/contact_selectors.php");
|
||||
|
@ -14,7 +15,7 @@ require_once("include/network.php");
|
|||
function notifications_post(App $a) {
|
||||
|
||||
if (! local_user()) {
|
||||
goaway(z_root());
|
||||
goaway(System::baseUrl());
|
||||
}
|
||||
|
||||
$request_id = (($a->argc > 1) ? $a->argv[1] : 0);
|
||||
|
|
|
@ -1,6 +1,7 @@
|
|||
<?php
|
||||
|
||||
use Friendica\App;
|
||||
use Friendica\Core\System;
|
||||
|
||||
require_once('include/NotificationsManager.php');
|
||||
|
||||
|
@ -23,14 +24,14 @@ function notify_init(App $a) {
|
|||
$guid = basename($urldata["path"]);
|
||||
$itemdata = get_item_id($guid, local_user());
|
||||
if ($itemdata["id"] != 0) {
|
||||
$note['link'] = App::get_baseurl().'/display/'.$itemdata["nick"].'/'.$itemdata["id"];
|
||||
$note['link'] = System::baseUrl().'/display/'.$itemdata["nick"].'/'.$itemdata["id"];
|
||||
}
|
||||
}
|
||||
|
||||
goaway($note['link']);
|
||||
}
|
||||
|
||||
goaway(App::get_baseurl(true));
|
||||
goaway(System::baseUrl(true));
|
||||
}
|
||||
|
||||
if ($a->argc > 2 && $a->argv[1] === 'mark' && $a->argv[2] === 'all' ) {
|
||||
|
@ -58,7 +59,7 @@ function notify_content(App $a) {
|
|||
if (dbm::is_result($r) > 0) {
|
||||
foreach ($r as $it) {
|
||||
$notif_content .= replace_macros($not_tpl,array(
|
||||
'$item_link' => App::get_baseurl(true).'/notify/view/'. $it['id'],
|
||||
'$item_link' => System::baseUrl(true).'/notify/view/'. $it['id'],
|
||||
'$item_image' => $it['photo'],
|
||||
'$item_text' => strip_tags(bbcode($it['msg'])),
|
||||
'$item_when' => relative_date($it['date'])
|
||||
|
|
|
@ -1,13 +1,14 @@
|
|||
<?php
|
||||
|
||||
use Friendica\App;
|
||||
use Friendica\Core\System;
|
||||
|
||||
function oexchange_init(App $a) {
|
||||
|
||||
if (($a->argc > 1) && ($a->argv[1] === 'xrd')) {
|
||||
$tpl = get_markup_template('oexchange_xrd.tpl');
|
||||
|
||||
$o = replace_macros($tpl, array('$base' => App::get_baseurl()));
|
||||
$o = replace_macros($tpl, array('$base' => System::baseUrl()));
|
||||
echo $o;
|
||||
killme();
|
||||
}
|
||||
|
@ -34,7 +35,7 @@ function oexchange_content(App $a) {
|
|||
$tags = (((x($_REQUEST,'tags')) && strlen($_REQUEST['tags']))
|
||||
? '&tags=' . urlencode(notags(trim($_REQUEST['tags']))) : '');
|
||||
|
||||
$s = fetch_url(App::get_baseurl() . '/parse_url?f=&url=' . $url . $title . $description . $tags);
|
||||
$s = fetch_url(System::baseUrl() . '/parse_url?f=&url=' . $url . $title . $description . $tags);
|
||||
|
||||
if (! strlen($s)) {
|
||||
return;
|
||||
|
|
|
@ -1,6 +1,7 @@
|
|||
<?php
|
||||
|
||||
use Friendica\App;
|
||||
use Friendica\Core\System;
|
||||
|
||||
require_once('library/openid.php');
|
||||
|
||||
|
@ -8,7 +9,7 @@ function openid_content(App $a) {
|
|||
|
||||
$noid = get_config('system','no_openid');
|
||||
if($noid)
|
||||
goaway(z_root());
|
||||
goaway(System::baseUrl());
|
||||
|
||||
logger('mod_openid ' . print_r($_REQUEST,true), LOGGER_DATA);
|
||||
|
||||
|
@ -22,7 +23,7 @@ function openid_content(App $a) {
|
|||
|
||||
if(! strlen($authid)) {
|
||||
logger( t('OpenID protocol error. No ID returned.') . EOL);
|
||||
goaway(z_root());
|
||||
goaway(System::baseUrl());
|
||||
}
|
||||
|
||||
// NOTE: we search both for normalised and non-normalised form of $authid
|
||||
|
@ -50,7 +51,7 @@ function openid_content(App $a) {
|
|||
// just in case there was no return url set
|
||||
// and we fell through
|
||||
|
||||
goaway(z_root());
|
||||
goaway(System::baseUrl());
|
||||
}
|
||||
|
||||
// Successful OpenID login - but we can't match it to an existing account.
|
||||
|
@ -58,7 +59,7 @@ function openid_content(App $a) {
|
|||
|
||||
if ($a->config['register_policy'] == REGISTER_CLOSED) {
|
||||
notice( t('Account not found and OpenID registration is not permitted on this site.') . EOL);
|
||||
goaway(z_root());
|
||||
goaway(System::baseUrl());
|
||||
}
|
||||
|
||||
unset($_SESSION['register']);
|
||||
|
@ -102,12 +103,12 @@ function openid_content(App $a) {
|
|||
|
||||
$args .= '&openid_url=' . urlencode(notags(trim($authid)));
|
||||
|
||||
goaway(App::get_baseurl() . '/register?' . $args);
|
||||
goaway(System::baseUrl() . '/register?' . $args);
|
||||
|
||||
// NOTREACHED
|
||||
}
|
||||
}
|
||||
notice( t('Login failed.') . EOL);
|
||||
goaway(z_root());
|
||||
goaway(System::baseUrl());
|
||||
// NOTREACHED
|
||||
}
|
||||
|
|
|
@ -1,6 +1,7 @@
|
|||
<?php
|
||||
|
||||
use Friendica\App;
|
||||
use Friendica\Core\System;
|
||||
|
||||
function opensearch_content(App $a) {
|
||||
|
||||
|
@ -9,7 +10,7 @@ function opensearch_content(App $a) {
|
|||
header("Content-type: application/opensearchdescription+xml");
|
||||
|
||||
$o = replace_macros($tpl, array(
|
||||
'$baseurl' => App::get_baseurl(),
|
||||
'$baseurl' => System::baseUrl(),
|
||||
'$nodename' => $a->get_hostname(),
|
||||
));
|
||||
|
||||
|
|
|
@ -1,6 +1,7 @@
|
|||
<?php
|
||||
|
||||
use Friendica\App;
|
||||
use Friendica\Core\System;
|
||||
|
||||
require_once 'include/probe.php';
|
||||
require_once 'include/follow.php';
|
||||
|
@ -50,7 +51,7 @@ function ostatus_subscribe_content(App $a) {
|
|||
$total = sizeof($friends);
|
||||
|
||||
if ($counter >= $total) {
|
||||
$a->page['htmlhead'] = '<meta http-equiv="refresh" content="0; URL='.App::get_baseurl().'/settings/connectors">';
|
||||
$a->page['htmlhead'] = '<meta http-equiv="refresh" content="0; URL='.System::baseUrl().'/settings/connectors">';
|
||||
del_pconfig($uid, "ostatus", "legacy_friends");
|
||||
del_pconfig($uid, "ostatus", "legacy_contact");
|
||||
$o .= t("Done");
|
||||
|
@ -79,7 +80,7 @@ function ostatus_subscribe_content(App $a) {
|
|||
|
||||
$o .= "<p>".t("Keep this window open until done.")."</p>";
|
||||
|
||||
$a->page['htmlhead'] = '<meta http-equiv="refresh" content="0; URL='.App::get_baseurl().'/ostatus_subscribe?counter='.$counter.'">';
|
||||
$a->page['htmlhead'] = '<meta http-equiv="refresh" content="0; URL='.System::baseUrl().'/ostatus_subscribe?counter='.$counter.'">';
|
||||
|
||||
return $o;
|
||||
}
|
||||
|
|
|
@ -4,6 +4,7 @@ This file is part of the Diaspora protocol. It is used for fetching single publi
|
|||
*/
|
||||
|
||||
use Friendica\App;
|
||||
use Friendica\Core\System;
|
||||
|
||||
require_once("include/diaspora.php");
|
||||
|
||||
|
@ -34,7 +35,7 @@ function p_init($a){
|
|||
$parts = parse_url($r[0]["author-link"]);
|
||||
$host = $parts["scheme"]."://".$parts["host"];
|
||||
|
||||
if (normalise_link($host) != normalise_link(App::get_baseurl())) {
|
||||
if (normalise_link($host) != normalise_link(System::baseUrl())) {
|
||||
$location = $host."/p/".urlencode($guid).".xml";
|
||||
|
||||
header("HTTP/1.1 301 Moved Permanently");
|
||||
|
|
|
@ -1,6 +1,7 @@
|
|||
<?php
|
||||
|
||||
use Friendica\App;
|
||||
use Friendica\Core\System;
|
||||
use Friendica\Core\Config;
|
||||
use Friendica\Network\Probe;
|
||||
|
||||
|
@ -95,7 +96,7 @@ function photos_init(App $a) {
|
|||
'$title' => t('Photo Albums'),
|
||||
'$recent' => t('Recent Photos'),
|
||||
'$albums' => $albums['albums'],
|
||||
'$baseurl' => z_root(),
|
||||
'$baseurl' => System::baseUrl(),
|
||||
'$upload' => array(t('Upload New Photos'), 'photos/' . $a->data['user']['nickname'] . '/upload'),
|
||||
'$can_post' => $can_post
|
||||
));
|
||||
|
@ -373,7 +374,7 @@ function photos_post(App $a) {
|
|||
create_tags_from_itemuri($i[0]['uri'], $page_owner_uid);
|
||||
delete_thread_uri($i[0]['uri'], $page_owner_uid);
|
||||
|
||||
$url = App::get_baseurl();
|
||||
$url = System::baseUrl();
|
||||
$drop_id = intval($i[0]['id']);
|
||||
|
||||
// Update the photo albums cache
|
||||
|
@ -525,8 +526,8 @@ function photos_post(App $a) {
|
|||
$arr['visible'] = $visibility;
|
||||
$arr['origin'] = 1;
|
||||
|
||||
$arr['body'] = '[url=' . App::get_baseurl() . '/photos/' . $a->data['user']['nickname'] . '/image/' . $p[0]['resource-id'] . ']'
|
||||
. '[img]' . App::get_baseurl() . '/photo/' . $p[0]['resource-id'] . '-' . $p[0]['scale'] . '.'. $ext . '[/img]'
|
||||
$arr['body'] = '[url=' . System::baseUrl() . '/photos/' . $a->data['user']['nickname'] . '/image/' . $p[0]['resource-id'] . ']'
|
||||
. '[img]' . System::baseUrl() . '/photo/' . $p[0]['resource-id'] . '-' . $p[0]['scale'] . '.'. $ext . '[/img]'
|
||||
. '[/url]';
|
||||
|
||||
$item_id = item_store($arr);
|
||||
|
@ -640,7 +641,7 @@ function photos_post(App $a) {
|
|||
}
|
||||
} elseif (strpos($tag, '#') === 0) {
|
||||
$tagname = substr($tag, 1);
|
||||
$str_tags .= '#[url=' . App::get_baseurl() . "/search?tag=" . $tagname . ']' . $tagname . '[/url]';
|
||||
$str_tags .= '#[url=' . System::baseUrl() . "/search?tag=" . $tagname . ']' . $tagname . '[/url]';
|
||||
}
|
||||
}
|
||||
}
|
||||
|
@ -712,8 +713,8 @@ function photos_post(App $a) {
|
|||
$arr['tag'] = $tagged[4];
|
||||
$arr['inform'] = $tagged[2];
|
||||
$arr['origin'] = 1;
|
||||
$arr['body'] = sprintf( t('%1$s was tagged in %2$s by %3$s'), '[url=' . $tagged[1] . ']' . $tagged[0] . '[/url]', '[url=' . App::get_baseurl() . '/photos/' . $owner_record['nickname'] . '/image/' . $p[0]['resource-id'] . ']' . t('a photo') . '[/url]', '[url=' . $owner_record['url'] . ']' . $owner_record['name'] . '[/url]') ;
|
||||
$arr['body'] .= "\n\n" . '[url=' . App::get_baseurl() . '/photos/' . $owner_record['nickname'] . '/image/' . $p[0]['resource-id'] . ']' . '[img]' . App::get_baseurl() . "/photo/" . $p[0]['resource-id'] . '-' . $best . '.' . $ext . '[/img][/url]' . "\n" ;
|
||||
$arr['body'] = sprintf( t('%1$s was tagged in %2$s by %3$s'), '[url=' . $tagged[1] . ']' . $tagged[0] . '[/url]', '[url=' . System::baseUrl() . '/photos/' . $owner_record['nickname'] . '/image/' . $p[0]['resource-id'] . ']' . t('a photo') . '[/url]', '[url=' . $owner_record['url'] . ']' . $owner_record['name'] . '[/url]') ;
|
||||
$arr['body'] .= "\n\n" . '[url=' . System::baseUrl() . '/photos/' . $owner_record['nickname'] . '/image/' . $p[0]['resource-id'] . ']' . '[img]' . System::baseUrl() . "/photo/" . $p[0]['resource-id'] . '-' . $best . '.' . $ext . '[/img][/url]' . "\n" ;
|
||||
|
||||
$arr['object'] = '<object><type>' . ACTIVITY_OBJ_PERSON . '</type><title>' . $tagged[0] . '</title><id>' . $tagged[1] . '/' . $tagged[0] . '</id>';
|
||||
$arr['object'] .= '<link>' . xmlify('<link rel="alternate" type="text/html" href="' . $tagged[1] . '" />' . "\n");
|
||||
|
@ -723,8 +724,8 @@ function photos_post(App $a) {
|
|||
$arr['object'] .= '</link></object>' . "\n";
|
||||
|
||||
$arr['target'] = '<target><type>' . ACTIVITY_OBJ_IMAGE . '</type><title>' . $p[0]['desc'] . '</title><id>'
|
||||
. App::get_baseurl() . '/photos/' . $owner_record['nickname'] . '/image/' . $p[0]['resource-id'] . '</id>';
|
||||
$arr['target'] .= '<link>' . xmlify('<link rel="alternate" type="text/html" href="' . App::get_baseurl() . '/photos/' . $owner_record['nickname'] . '/image/' . $p[0]['resource-id'] . '" />' . "\n" . '<link rel="preview" type="'.$p[0]['type'].'" href="' . App::get_baseurl() . "/photo/" . $p[0]['resource-id'] . '-' . $best . '.' . $ext . '" />') . '</link></target>';
|
||||
. System::baseUrl() . '/photos/' . $owner_record['nickname'] . '/image/' . $p[0]['resource-id'] . '</id>';
|
||||
$arr['target'] .= '<link>' . xmlify('<link rel="alternate" type="text/html" href="' . System::baseUrl() . '/photos/' . $owner_record['nickname'] . '/image/' . $p[0]['resource-id'] . '" />' . "\n" . '<link rel="preview" type="'.$p[0]['type'].'" href="' . System::baseUrl() . "/photo/" . $p[0]['resource-id'] . '-' . $best . '.' . $ext . '" />') . '</link></target>';
|
||||
|
||||
$item_id = item_store($arr);
|
||||
if ($item_id) {
|
||||
|
@ -942,8 +943,8 @@ function photos_post(App $a) {
|
|||
$arr['visible'] = $visible;
|
||||
$arr['origin'] = 1;
|
||||
|
||||
$arr['body'] = '[url=' . App::get_baseurl() . '/photos/' . $owner_record['nickname'] . '/image/' . $photo_hash . ']'
|
||||
. '[img]' . App::get_baseurl() . "/photo/{$photo_hash}-{$smallest}.".$ph->getExt() . '[/img]'
|
||||
$arr['body'] = '[url=' . System::baseUrl() . '/photos/' . $owner_record['nickname'] . '/image/' . $photo_hash . ']'
|
||||
. '[img]' . System::baseUrl() . "/photo/{$photo_hash}-{$smallest}.".$ph->getExt() . '[/img]'
|
||||
. '[/url]';
|
||||
|
||||
$item_id = item_store($arr);
|
||||
|
|
11
mod/ping.php
11
mod/ping.php
|
@ -1,6 +1,7 @@
|
|||
<?php
|
||||
|
||||
use Friendica\App;
|
||||
use Friendica\Core\System;
|
||||
|
||||
require_once('include/datetime.php');
|
||||
require_once('include/bbcode.php');
|
||||
|
@ -182,7 +183,7 @@ function ping_init(App $a)
|
|||
$intro_count = count($intros1) + count($intros2);
|
||||
$intros = $intros1 + $intros2;
|
||||
|
||||
$myurl = App::get_baseurl() . '/profile/' . $a->user['nickname'] ;
|
||||
$myurl = System::baseUrl() . '/profile/' . $a->user['nickname'] ;
|
||||
$mails = qu("SELECT `id`, `from-name`, `from-url`, `from-photo`, `created` FROM `mail`
|
||||
WHERE `uid` = %d AND `seen` = 0 AND `from-url` != '%s' ",
|
||||
intval(local_user()),
|
||||
|
@ -265,7 +266,7 @@ function ping_init(App $a)
|
|||
if (dbm::is_result($intros)) {
|
||||
foreach ($intros as $intro) {
|
||||
$notif = array(
|
||||
'href' => App::get_baseurl() . '/notifications/intros/' . $intro['id'],
|
||||
'href' => System::baseUrl() . '/notifications/intros/' . $intro['id'],
|
||||
'name' => $intro['name'],
|
||||
'url' => $intro['url'],
|
||||
'photo' => $intro['photo'],
|
||||
|
@ -280,7 +281,7 @@ function ping_init(App $a)
|
|||
if (dbm::is_result($mails)) {
|
||||
foreach ($mails as $mail) {
|
||||
$notif = array(
|
||||
'href' => App::get_baseurl() . '/message/' . $mail['id'],
|
||||
'href' => System::baseUrl() . '/message/' . $mail['id'],
|
||||
'name' => $mail['from-name'],
|
||||
'url' => $mail['from-url'],
|
||||
'photo' => $mail['from-photo'],
|
||||
|
@ -295,7 +296,7 @@ function ping_init(App $a)
|
|||
if (dbm::is_result($regs)) {
|
||||
foreach ($regs as $reg) {
|
||||
$notif = array(
|
||||
'href' => App::get_baseurl() . '/admin/users/',
|
||||
'href' => System::baseUrl() . '/admin/users/',
|
||||
'name' => $reg['name'],
|
||||
'url' => $reg['url'],
|
||||
'photo' => $reg['micro'],
|
||||
|
@ -472,7 +473,7 @@ function ping_get_notifications($uid)
|
|||
);
|
||||
}
|
||||
|
||||
$notification["href"] = App::get_baseurl() . "/notify/view/" . $notification["id"];
|
||||
$notification["href"] = System::baseUrl() . "/notify/view/" . $notification["id"];
|
||||
|
||||
if ($notification["visible"] && !$notification["spam"] &&
|
||||
!$notification["deleted"] && !is_array($result[$notification["parent"]])) {
|
||||
|
|
|
@ -15,6 +15,7 @@
|
|||
*/
|
||||
|
||||
use Friendica\App;
|
||||
use Friendica\Core\System;
|
||||
|
||||
require_once('include/security.php');
|
||||
require_once('include/bbcode.php');
|
||||
|
@ -123,7 +124,7 @@ function poke_init(App $a) {
|
|||
$arr['origin'] = 1;
|
||||
$arr['body'] = '[url=' . $poster['url'] . ']' . $poster['name'] . '[/url]' . ' ' . t($verbs[$verb][0]) . ' ' . '[url=' . $target['url'] . ']' . $target['name'] . '[/url]';
|
||||
|
||||
$arr['object'] = '<object><type>' . ACTIVITY_OBJ_PERSON . '</type><title>' . $target['name'] . '</title><id>' . App::get_baseurl() . '/contact/' . $target['id'] . '</id>';
|
||||
$arr['object'] = '<object><type>' . ACTIVITY_OBJ_PERSON . '</type><title>' . $target['name'] . '</title><id>' . System::baseUrl() . '/contact/' . $target['id'] . '</id>';
|
||||
$arr['object'] .= '<link>' . xmlify('<link rel="alternate" type="text/html" href="' . $target['url'] . '" />' . "\n");
|
||||
|
||||
$arr['object'] .= xmlify('<link rel="photo" type="image/jpeg" href="' . $target['photo'] . '" />' . "\n");
|
||||
|
@ -132,7 +133,7 @@ function poke_init(App $a) {
|
|||
$item_id = item_store($arr);
|
||||
if($item_id) {
|
||||
//q("UPDATE `item` SET `plink` = '%s' WHERE `uid` = %d AND `id` = %d",
|
||||
// dbesc(App::get_baseurl() . '/display/' . $poster['nickname'] . '/' . $item_id),
|
||||
// dbesc(System::baseUrl() . '/display/' . $poster['nickname'] . '/' . $item_id),
|
||||
// intval($uid),
|
||||
// intval($item_id)
|
||||
//);
|
||||
|
@ -171,11 +172,11 @@ function poke_content(App $a) {
|
|||
}
|
||||
|
||||
|
||||
$base = App::get_baseurl();
|
||||
$base = System::baseUrl();
|
||||
|
||||
$head_tpl = get_markup_template('poke_head.tpl');
|
||||
$a->page['htmlhead'] .= replace_macros($head_tpl,array(
|
||||
'$baseurl' => App::get_baseurl(true),
|
||||
'$baseurl' => System::baseUrl(true),
|
||||
'$base' => $base
|
||||
));
|
||||
|
||||
|
|
|
@ -1,6 +1,7 @@
|
|||
<?php
|
||||
|
||||
use Friendica\App;
|
||||
use Friendica\Core\System;
|
||||
|
||||
require_once('include/contact_widgets.php');
|
||||
require_once('include/redir.php');
|
||||
|
@ -15,7 +16,7 @@ function profile_init(App $a) {
|
|||
else {
|
||||
$r = q("select nickname from user where blocked = 0 and account_expired = 0 and account_removed = 0 and verified = 1 order by rand() limit 1");
|
||||
if (dbm::is_result($r)) {
|
||||
goaway(App::get_baseurl() . '/profile/' . $r[0]['nickname']);
|
||||
goaway(System::baseUrl() . '/profile/' . $r[0]['nickname']);
|
||||
}
|
||||
else {
|
||||
logger('profile error: mod_profile ' . $a->query_string, LOGGER_DEBUG);
|
||||
|
@ -58,16 +59,16 @@ function profile_init(App $a) {
|
|||
}
|
||||
|
||||
$a->page['htmlhead'] .= '<meta name="dfrn-global-visibility" content="' . (($a->profile['net-publish']) ? 'true' : 'false') . '" />' . "\r\n" ;
|
||||
$a->page['htmlhead'] .= '<link rel="alternate" type="application/atom+xml" href="' . App::get_baseurl() . '/dfrn_poll/' . $which .'" />' . "\r\n" ;
|
||||
$a->page['htmlhead'] .= '<link rel="alternate" type="application/atom+xml" href="' . System::baseUrl() . '/dfrn_poll/' . $which .'" />' . "\r\n" ;
|
||||
$uri = urlencode('acct:' . $a->profile['nickname'] . '@' . $a->get_hostname() . (($a->path) ? '/' . $a->path : ''));
|
||||
$a->page['htmlhead'] .= '<link rel="lrdd" type="application/xrd+xml" href="' . App::get_baseurl() . '/xrd/?uri=' . $uri . '" />' . "\r\n";
|
||||
header('Link: <' . App::get_baseurl() . '/xrd/?uri=' . $uri . '>; rel="lrdd"; type="application/xrd+xml"', false);
|
||||
$a->page['htmlhead'] .= '<link rel="lrdd" type="application/xrd+xml" href="' . System::baseUrl() . '/xrd/?uri=' . $uri . '" />' . "\r\n";
|
||||
header('Link: <' . System::baseUrl() . '/xrd/?uri=' . $uri . '>; rel="lrdd"; type="application/xrd+xml"', false);
|
||||
|
||||
$dfrn_pages = array('request', 'confirm', 'notify', 'poll');
|
||||
foreach ($dfrn_pages as $dfrn) {
|
||||
$a->page['htmlhead'] .= "<link rel=\"dfrn-{$dfrn}\" href=\"".App::get_baseurl()."/dfrn_{$dfrn}/{$which}\" />\r\n";
|
||||
$a->page['htmlhead'] .= "<link rel=\"dfrn-{$dfrn}\" href=\"".System::baseUrl()."/dfrn_{$dfrn}/{$which}\" />\r\n";
|
||||
}
|
||||
$a->page['htmlhead'] .= "<link rel=\"dfrn-poco\" href=\"".App::get_baseurl()."/poco/{$which}\" />\r\n";
|
||||
$a->page['htmlhead'] .= "<link rel=\"dfrn-poco\" href=\"".System::baseUrl()."/poco/{$which}\" />\r\n";
|
||||
|
||||
}
|
||||
|
||||
|
@ -179,8 +180,8 @@ function profile_content(App $a, $update = 0) {
|
|||
$commpage = (($a->profile['page-flags'] == PAGE_COMMUNITY) ? true : false);
|
||||
$commvisitor = (($commpage && $remote_contact == true) ? true : false);
|
||||
|
||||
$a->page['aside'] .= posted_date_widget(App::get_baseurl(true) . '/profile/' . $a->profile['nickname'],$a->profile['profile_uid'],true);
|
||||
$a->page['aside'] .= categories_widget(App::get_baseurl(true) . '/profile/' . $a->profile['nickname'],(x($category) ? xmlify($category) : ''));
|
||||
$a->page['aside'] .= posted_date_widget(System::baseUrl(true) . '/profile/' . $a->profile['nickname'],$a->profile['profile_uid'],true);
|
||||
$a->page['aside'] .= categories_widget(System::baseUrl(true) . '/profile/' . $a->profile['nickname'],(x($category) ? xmlify($category) : ''));
|
||||
|
||||
if (can_write_wall($a,$a->profile['profile_uid'])) {
|
||||
|
||||
|
|
|
@ -1,6 +1,7 @@
|
|||
<?php
|
||||
|
||||
use Friendica\App;
|
||||
use Friendica\Core\System;
|
||||
|
||||
require_once("include/Photo.php");
|
||||
|
||||
|
@ -102,15 +103,15 @@ function profile_photo_post(App $a) {
|
|||
);
|
||||
|
||||
$r = q("UPDATE `contact` SET `photo` = '%s', `thumb` = '%s', `micro` = '%s' WHERE `self` AND `uid` = %d",
|
||||
dbesc(App::get_baseurl() . '/photo/' . $base_image['resource-id'] . '-4.' . $im->getExt()),
|
||||
dbesc(App::get_baseurl() . '/photo/' . $base_image['resource-id'] . '-5.' . $im->getExt()),
|
||||
dbesc(App::get_baseurl() . '/photo/' . $base_image['resource-id'] . '-6.' . $im->getExt()),
|
||||
dbesc(System::baseUrl() . '/photo/' . $base_image['resource-id'] . '-4.' . $im->getExt()),
|
||||
dbesc(System::baseUrl() . '/photo/' . $base_image['resource-id'] . '-5.' . $im->getExt()),
|
||||
dbesc(System::baseUrl() . '/photo/' . $base_image['resource-id'] . '-6.' . $im->getExt()),
|
||||
intval(local_user())
|
||||
);
|
||||
} else {
|
||||
$r = q("update profile set photo = '%s', thumb = '%s' where id = %d and uid = %d",
|
||||
dbesc(App::get_baseurl() . '/photo/' . $base_image['resource-id'] . '-4.' . $im->getExt()),
|
||||
dbesc(App::get_baseurl() . '/photo/' . $base_image['resource-id'] . '-5.' . $im->getExt()),
|
||||
dbesc(System::baseUrl() . '/photo/' . $base_image['resource-id'] . '-4.' . $im->getExt()),
|
||||
dbesc(System::baseUrl() . '/photo/' . $base_image['resource-id'] . '-5.' . $im->getExt()),
|
||||
intval($_REQUEST['profile']),
|
||||
intval(local_user())
|
||||
);
|
||||
|
@ -126,7 +127,7 @@ function profile_photo_post(App $a) {
|
|||
|
||||
info( t('Shift-reload the page or clear browser cache if the new photo does not display immediately.') . EOL);
|
||||
// Update global directory in background
|
||||
$url = App::get_baseurl() . '/profile/' . $a->user['nickname'];
|
||||
$url = System::baseUrl() . '/profile/' . $a->user['nickname'];
|
||||
if ($url && strlen(get_config('system','directory'))) {
|
||||
proc_run(PRIORITY_LOW, "include/directory.php", $url);
|
||||
}
|
||||
|
@ -137,7 +138,7 @@ function profile_photo_post(App $a) {
|
|||
}
|
||||
}
|
||||
|
||||
goaway(App::get_baseurl() . '/profiles');
|
||||
goaway(System::baseUrl() . '/profiles');
|
||||
return; // NOTREACHED
|
||||
}
|
||||
|
||||
|
@ -231,7 +232,7 @@ function profile_photo_content(App $a) {
|
|||
proc_run(PRIORITY_LOW, "include/directory.php", $url);
|
||||
}
|
||||
|
||||
goaway(App::get_baseurl() . '/profiles');
|
||||
goaway(System::baseUrl() . '/profiles');
|
||||
return; // NOTREACHED
|
||||
}
|
||||
$ph = new Photo($r[0]['data'], $r[0]['type']);
|
||||
|
@ -256,7 +257,7 @@ function profile_photo_content(App $a) {
|
|||
'$submit' => t('Upload'),
|
||||
'$profiles' => $profiles,
|
||||
'$form_security_token' => get_form_security_token("profile_photo"),
|
||||
'$select' => sprintf('%s %s', t('or'), ($newuser) ? '<a href="' . App::get_baseurl() . '">' . t('skip this step') . '</a>' : '<a href="'. App::get_baseurl() . '/photos/' . $a->user['nickname'] . '">' . t('select a photo from your photo albums') . '</a>')
|
||||
'$select' => sprintf('%s %s', t('or'), ($newuser) ? '<a href="' . System::baseUrl() . '">' . t('skip this step') . '</a>' : '<a href="'. System::baseUrl() . '/photos/' . $a->user['nickname'] . '">' . t('select a photo from your photo albums') . '</a>')
|
||||
));
|
||||
|
||||
return $o;
|
||||
|
@ -269,7 +270,7 @@ function profile_photo_content(App $a) {
|
|||
'$filename' => $filename,
|
||||
'$profile' => intval($_REQUEST['profile']),
|
||||
'$resource' => $a->config['imagecrop'] . '-' . $a->config['imagecrop_resolution'],
|
||||
'$image_url' => App::get_baseurl() . '/photo/' . $filename,
|
||||
'$image_url' => System::baseUrl() . '/photo/' . $filename,
|
||||
'$title' => t('Crop Image'),
|
||||
'$desc' => t('Please adjust the image cropping for optimum viewing.'),
|
||||
'$form_security_token' => get_form_security_token("profile_photo"),
|
||||
|
|
|
@ -1,6 +1,7 @@
|
|||
<?php
|
||||
|
||||
use Friendica\App;
|
||||
use Friendica\Core\System;
|
||||
use Friendica\Network\Probe;
|
||||
|
||||
require_once 'include/Contact.php';
|
||||
|
@ -627,10 +628,10 @@ function profiles_content(App $a) {
|
|||
|
||||
|
||||
$a->page['htmlhead'] .= replace_macros(get_markup_template('profed_head.tpl'), array(
|
||||
'$baseurl' => App::get_baseurl(true),
|
||||
'$baseurl' => System::baseUrl(true),
|
||||
));
|
||||
$a->page['end'] .= replace_macros(get_markup_template('profed_end.tpl'), array(
|
||||
'$baseurl' => App::get_baseurl(true),
|
||||
'$baseurl' => System::baseUrl(true),
|
||||
));
|
||||
|
||||
$opt_tpl = get_markup_template("profile-hide-friends.tpl");
|
||||
|
@ -707,7 +708,7 @@ function profiles_content(App $a) {
|
|||
'$lbl_ex2' => t('Example: fishing photography software'),
|
||||
|
||||
'$disabled' => (($is_default) ? 'onclick="return false;" style="color: #BBBBFF;"' : ''),
|
||||
'$baseurl' => App::get_baseurl(true),
|
||||
'$baseurl' => System::baseUrl(true),
|
||||
'$profile_id' => $r[0]['id'],
|
||||
'$profile_name' => array('profile_name', t('Profile Name:'), $r[0]['profile-name'], t('Required'), '*'),
|
||||
'$is_default' => $is_default,
|
||||
|
|
|
@ -2,6 +2,7 @@
|
|||
// Based upon "Privacy Image Cache" by Tobias Hößl <https://github.com/CatoTH/>
|
||||
|
||||
use Friendica\App;
|
||||
use Friendica\Core\System;
|
||||
|
||||
define('PROXY_DEFAULT_TIME', 86400); // 1 Day
|
||||
|
||||
|
@ -265,7 +266,7 @@ function proxy_url($url, $writemode = false, $size = '') {
|
|||
|
||||
// Only continue if it isn't a local image and the isn't deactivated
|
||||
if (proxy_is_local_image($url)) {
|
||||
$url = str_replace(normalise_link(App::get_baseurl()) . '/', App::get_baseurl() . '/', $url);
|
||||
$url = str_replace(normalise_link(System::baseUrl()) . '/', System::baseUrl() . '/', $url);
|
||||
return $url;
|
||||
}
|
||||
|
||||
|
@ -298,7 +299,7 @@ function proxy_url($url, $writemode = false, $size = '') {
|
|||
$longpath .= '.' . $extension;
|
||||
}
|
||||
|
||||
$proxypath = App::get_baseurl() . '/proxy/' . $longpath;
|
||||
$proxypath = System::baseUrl() . '/proxy/' . $longpath;
|
||||
|
||||
if ($size != '') {
|
||||
$size = ':' . $size;
|
||||
|
@ -309,7 +310,7 @@ function proxy_url($url, $writemode = false, $size = '') {
|
|||
if ((strlen($proxypath) > 250) && $writemode) {
|
||||
return $shortpath;
|
||||
} elseif (strlen($proxypath) > 250) {
|
||||
return App::get_baseurl() . '/proxy/' . $shortpath . '?url=' . urlencode($url);
|
||||
return System::baseUrl() . '/proxy/' . $shortpath . '?url=' . urlencode($url);
|
||||
} elseif ($writemode) {
|
||||
return $longpath;
|
||||
} else {
|
||||
|
@ -331,7 +332,7 @@ function proxy_is_local_image($url) {
|
|||
}
|
||||
|
||||
// links normalised - bug #431
|
||||
$baseurl = normalise_link(App::get_baseurl());
|
||||
$baseurl = normalise_link(System::baseUrl());
|
||||
$url = normalise_link($url);
|
||||
return (substr($url, 0, strlen($baseurl)) == $baseurl);
|
||||
}
|
||||
|
@ -373,7 +374,7 @@ function proxy_img_cb($matches) {
|
|||
}
|
||||
|
||||
function proxy_parse_html($html) {
|
||||
$html = str_replace(normalise_link(App::get_baseurl()) . '/', App::get_baseurl() . '/', $html);
|
||||
$html = str_replace(normalise_link(System::baseUrl()) . '/', System::baseUrl() . '/', $html);
|
||||
|
||||
return preg_replace_callback('/(<img [^>]*src *= *["\'])([^"\']+)(["\'][^>]*>)/siU', 'proxy_img_cb', $html);
|
||||
}
|
||||
|
|
|
@ -1,6 +1,7 @@
|
|||
<?php
|
||||
|
||||
use Friendica\App;
|
||||
use Friendica\Core\System;
|
||||
|
||||
function randprof_init(App $a) {
|
||||
require_once('include/Contact.php');
|
||||
|
@ -11,5 +12,5 @@ function randprof_init(App $a) {
|
|||
goaway(zrl($x));
|
||||
}
|
||||
|
||||
goaway(App::get_baseurl() . '/profile');
|
||||
goaway(System::baseUrl() . '/profile');
|
||||
}
|
||||
|
|
|
@ -1,6 +1,7 @@
|
|||
<?php
|
||||
|
||||
use Friendica\App;
|
||||
use Friendica\Core\System;
|
||||
|
||||
function redir_init(App $a) {
|
||||
|
||||
|
@ -21,7 +22,7 @@ function redir_init(App $a) {
|
|||
);
|
||||
|
||||
if((! dbm::is_result($r)) || ($r[0]['network'] !== NETWORK_DFRN))
|
||||
goaway(z_root());
|
||||
goaway(System::baseUrl());
|
||||
|
||||
$cid = $r[0]['id'];
|
||||
}
|
||||
|
@ -34,7 +35,7 @@ function redir_init(App $a) {
|
|||
);
|
||||
|
||||
if((! dbm::is_result($r)) || ($r[0]['network'] !== NETWORK_DFRN))
|
||||
goaway(z_root());
|
||||
goaway(System::baseUrl());
|
||||
}
|
||||
|
||||
$dfrn_id = $orig_id = (($r[0]['issued-id']) ? $r[0]['issued-id'] : $r[0]['dfrn-id']);
|
||||
|
@ -66,7 +67,7 @@ function redir_init(App $a) {
|
|||
}
|
||||
|
||||
if (local_user()) {
|
||||
$handle = $a->user['nickname'] . '@' . substr(App::get_baseurl(),strpos(App::get_baseurl(),'://')+3);
|
||||
$handle = $a->user['nickname'] . '@' . substr(System::baseUrl(),strpos(System::baseUrl(),'://')+3);
|
||||
}
|
||||
if (remote_user()) {
|
||||
$handle = $_SESSION['handle'];
|
||||
|
@ -77,5 +78,5 @@ function redir_init(App $a) {
|
|||
goaway($url);
|
||||
}
|
||||
|
||||
goaway(z_root());
|
||||
goaway(System::baseUrl());
|
||||
}
|
||||
|
|
|
@ -1,6 +1,7 @@
|
|||
<?php
|
||||
|
||||
use Friendica\App;
|
||||
use Friendica\Core\System;
|
||||
|
||||
require_once('include/enotify.php');
|
||||
require_once('include/bbcode.php');
|
||||
|
@ -67,7 +68,7 @@ function register_post(App $a) {
|
|||
$user = $result['user'];
|
||||
|
||||
if($netpublish && $a->config['register_policy'] != REGISTER_APPROVE) {
|
||||
$url = App::get_baseurl() . '/profile/' . $user['nickname'];
|
||||
$url = System::baseUrl() . '/profile/' . $user['nickname'];
|
||||
proc_run(PRIORITY_LOW, "include/directory.php", $url);
|
||||
}
|
||||
|
||||
|
@ -88,13 +89,13 @@ function register_post(App $a) {
|
|||
$res = send_register_open_eml(
|
||||
$user['email'],
|
||||
$a->config['sitename'],
|
||||
App::get_baseurl(),
|
||||
System::baseUrl(),
|
||||
$user['username'],
|
||||
$result['password']);
|
||||
|
||||
if($res) {
|
||||
info( t('Registration successful. Please check your email for further instructions.') . EOL ) ;
|
||||
goaway(z_root());
|
||||
goaway(System::baseUrl());
|
||||
} else {
|
||||
notice(
|
||||
sprintf(
|
||||
|
@ -106,13 +107,13 @@ function register_post(App $a) {
|
|||
}
|
||||
} else {
|
||||
info( t('Registration successful.') . EOL ) ;
|
||||
goaway(z_root());
|
||||
goaway(System::baseUrl());
|
||||
}
|
||||
}
|
||||
elseif($a->config['register_policy'] == REGISTER_APPROVE) {
|
||||
if(! strlen($a->config['admin_email'])) {
|
||||
notice( t('Your registration can not be processed.') . EOL);
|
||||
goaway(z_root());
|
||||
goaway(System::baseUrl());
|
||||
}
|
||||
|
||||
$hash = random_string();
|
||||
|
@ -145,9 +146,9 @@ function register_post(App $a) {
|
|||
'source_name' => $user['username'],
|
||||
'source_mail' => $user['email'],
|
||||
'source_nick' => $user['nickname'],
|
||||
'source_link' => App::get_baseurl()."/admin/users/",
|
||||
'link' => App::get_baseurl()."/admin/users/",
|
||||
'source_photo' => App::get_baseurl() . "/photo/avatar/".$user['uid'].".jpg",
|
||||
'source_link' => System::baseUrl()."/admin/users/",
|
||||
'link' => System::baseUrl()."/admin/users/",
|
||||
'source_photo' => System::baseUrl() . "/photo/avatar/".$user['uid'].".jpg",
|
||||
'to_email' => $admin['email'],
|
||||
'uid' => $admin['uid'],
|
||||
'language' => ($admin['language']?$admin['language']:'en'),
|
||||
|
@ -161,7 +162,7 @@ function register_post(App $a) {
|
|||
$user['username']);
|
||||
|
||||
info( t('Your registration is pending approval by the site owner.') . EOL ) ;
|
||||
goaway(z_root());
|
||||
goaway(System::baseUrl());
|
||||
|
||||
|
||||
}
|
||||
|
|
Some files were not shown because too many files have changed in this diff Show More
Ładowanie…
Reference in New Issue