X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=mod%2Fphotos.php;h=2ca6c6a37bb132b482a786750f8b501433bdd91b;hb=cabaea38ac46132963011c724d9c0b380bb5d7c0;hp=fde2d6c897e40270f5a65445fc96a8da710645ef;hpb=f2da1c5ab981ad273961eec86a8efdb5e4f01b5c;p=friendica.git
diff --git a/mod/photos.php b/mod/photos.php
index fde2d6c897..2ca6c6a37b 100644
--- a/mod/photos.php
+++ b/mod/photos.php
@@ -398,8 +398,8 @@ function photos_post(App $a)
$arr['visible'] = $visibility;
$arr['origin'] = 1;
- $arr['body'] = '[url=' . System::baseUrl() . '/photos/' . $a->data['user']['nickname'] . '/image/' . $photo['resource-id'] . ']'
- . '[img]' . System::baseUrl() . '/photo/' . $photo['resource-id'] . '-' . $photo['scale'] . '.'. $ext . '[/img]'
+ $arr['body'] = '[url=' . DI::baseUrl() . '/photos/' . $a->data['user']['nickname'] . '/image/' . $photo['resource-id'] . ']'
+ . '[img]' . DI::baseUrl() . '/photo/' . $photo['resource-id'] . '-' . $photo['scale'] . '.'. $ext . '[/img]'
. '[/url]';
$item_id = Item::insert($arr);
@@ -509,7 +509,7 @@ function photos_post(App $a)
}
} elseif (strpos($tag, '#') === 0) {
$tagname = substr($tag, 1);
- $str_tags .= '#[url=' . System::baseUrl() . "/search?tag=" . $tagname . ']' . $tagname . '[/url],';
+ $str_tags .= '#[url=' . DI::baseUrl() . "/search?tag=" . $tagname . ']' . $tagname . '[/url],';
}
}
}
@@ -573,8 +573,8 @@ function photos_post(App $a)
$arr['tag'] = $tagged[4];
$arr['inform'] = $tagged[2];
$arr['origin'] = 1;
- $arr['body'] = L10n::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/' . $photo['resource-id'] . ']' . L10n::t('a photo') . '[/url]', '[url=' . $owner_record['url'] . ']' . $owner_record['name'] . '[/url]') ;
- $arr['body'] .= "\n\n" . '[url=' . System::baseUrl() . '/photos/' . $owner_record['nickname'] . '/image/' . $photo['resource-id'] . ']' . '[img]' . System::baseUrl() . "/photo/" . $photo['resource-id'] . '-' . $best . '.' . $ext . '[/img][/url]' . "\n" ;
+ $arr['body'] = L10n::t('%1$s was tagged in %2$s by %3$s', '[url=' . $tagged[1] . ']' . $tagged[0] . '[/url]', '[url=' . DI::baseUrl() . '/photos/' . $owner_record['nickname'] . '/image/' . $photo['resource-id'] . ']' . L10n::t('a photo') . '[/url]', '[url=' . $owner_record['url'] . ']' . $owner_record['name'] . '[/url]') ;
+ $arr['body'] .= "\n\n" . '[url=' . DI::baseUrl() . '/photos/' . $owner_record['nickname'] . '/image/' . $photo['resource-id'] . ']' . '[img]' . DI::baseUrl() . "/photo/" . $photo['resource-id'] . '-' . $best . '.' . $ext . '[/img][/url]' . "\n" ;
$arr['object'] = '' . "\n";
$arr['target'] = '' . Activity\ObjectType::IMAGE . '' . $photo['desc'] . ''
- . System::baseUrl() . '/photos/' . $owner_record['nickname'] . '/image/' . $photo['resource-id'] . '';
- $arr['target'] .= '' . XML::escape('' . "\n" . '') . '';
+ . DI::baseUrl() . '/photos/' . $owner_record['nickname'] . '/image/' . $photo['resource-id'] . '';
+ $arr['target'] .= '' . XML::escape('' . "\n" . '') . '';
Item::insert($arr);
}
@@ -804,8 +804,8 @@ function photos_post(App $a)
$arr['visible'] = $visible;
$arr['origin'] = 1;
- $arr['body'] = '[url=' . System::baseUrl() . '/photos/' . $owner_record['nickname'] . '/image/' . $resource_id . ']'
- . '[img]' . System::baseUrl() . "/photo/{$resource_id}-{$smallest}.".$image->getExt() . '[/img]'
+ $arr['body'] = '[url=' . DI::baseUrl() . '/photos/' . $owner_record['nickname'] . '/image/' . $resource_id . ']'
+ . '[img]' . DI::baseUrl() . "/photo/{$resource_id}-{$smallest}.".$image->getExt() . '[/img]'
. '[/url]';
$item_id = Item::insert($arr);
@@ -814,7 +814,7 @@ function photos_post(App $a)
Hook::callAll('photo_post_end', $item_id);
- // addon uploaders should call "killme()" [e.g. exit] within the photo_post_end hook
+ // addon uploaders should call "exit()" within the photo_post_end hook
// if they do not wish to be redirected
DI::baseUrl()->redirect($_SESSION['photo_return']);
@@ -1529,7 +1529,7 @@ function photos_content(App $a)
DI::page()['htmlhead'] .= "\n" . '' . "\n";
DI::page()['htmlhead'] .= '' . "\n";
- DI::page()['htmlhead'] .= '' . "\n";
+ DI::page()['htmlhead'] .= '' . "\n";
DI::page()['htmlhead'] .= '' . "\n";
DI::page()['htmlhead'] .= '' . "\n";