X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=mod%2Ffollow.php;h=b568d5736d1eab82d13b1b53f54c54aea6fe8dff;hb=d49f986d1eb6894dd948577288357b6c1755e3d3;hp=503410fd098ff4ed3b065ef22c01ea88d2dca18c;hpb=5358f5742e1332f25fc81bb9439a57c571eea569;p=friendica.git

diff --git a/mod/follow.php b/mod/follow.php
index 503410fd09..b568d5736d 100644
--- a/mod/follow.php
+++ b/mod/follow.php
@@ -4,16 +4,16 @@
  */
 use Friendica\App;
 use Friendica\Core\Config;
+use Friendica\Core\L10n;
 use Friendica\Core\System;
 use Friendica\Model\Contact;
+use Friendica\Model\Profile;
 use Friendica\Network\Probe;
 
-require_once 'include/contact_selectors.php';
-
 function follow_post(App $a) {
 
 	if (!local_user()) {
-		notice(t('Permission denied.') . EOL);
+		notice(L10n::t('Permission denied.') . EOL);
 		goaway($_SESSION['return_url']);
 		// NOTREACHED
 	}
@@ -43,7 +43,7 @@ function follow_post(App $a) {
 
 	info(t('Contact added').EOL);
 
-	if (strstr($return_url,'contacts')) {
+	if (strstr($return_url, 'contacts')) {
 		goaway(System::baseUrl().'/contacts/'.$contact_id);
 	}
 
@@ -54,7 +54,7 @@ function follow_post(App $a) {
 function follow_content(App $a) {
 
 	if (!local_user()) {
-		notice(t('Permission denied.') . EOL);
+		notice(L10n::t('Permission denied.') . EOL);
 		goaway($_SESSION['return_url']);
 		// NOTREACHED
 	}
@@ -73,7 +73,7 @@ function follow_content(App $a) {
 		dbesc(normalise_link($url)), dbesc($url), dbesc(NETWORK_STATUSNET));
 
 	if ($r) {
-		notice(t('You already added this contact.').EOL);
+		notice(L10n::t('You already added this contact.').EOL);
 		$submit = "";
 		//goaway($_SESSION['return_url']);
 		// NOTREACHED
@@ -81,22 +81,22 @@ function follow_content(App $a) {
 
 	$ret = Probe::uri($url);
 
-	if (($ret["network"] == NETWORK_DIASPORA) && !Config::get('system','diaspora_enabled')) {
-		notice(t("Diaspora support isn't enabled. Contact can't be added.") . EOL);
+	if (($ret["network"] == NETWORK_DIASPORA) && !Config::get('system', 'diaspora_enabled')) {
+		notice(L10n::t("Diaspora support isn't enabled. Contact can't be added.") . EOL);
 		$submit = "";
 		//goaway($_SESSION['return_url']);
 		// NOTREACHED
 	}
 
-	if (($ret["network"] == NETWORK_OSTATUS) && Config::get('system','ostatus_disabled')) {
-		notice(t("OStatus support is disabled. Contact can't be added.") . EOL);
+	if (($ret["network"] == NETWORK_OSTATUS) && Config::get('system', 'ostatus_disabled')) {
+		notice(L10n::t("OStatus support is disabled. Contact can't be added.") . EOL);
 		$submit = "";
 		//goaway($_SESSION['return_url']);
 		// NOTREACHED
 	}
 
 	if ($ret["network"] == NETWORK_PHANTOM) {
-		notice(t("The network type couldn't be detected. Contact can't be added.") . EOL);
+		notice(L10n::t("The network type couldn't be detected. Contact can't be added.") . EOL);
 		$submit = "";
 		//goaway($_SESSION['return_url']);
 		// NOTREACHED
@@ -117,7 +117,7 @@ function follow_content(App $a) {
 	$r = q("SELECT `url` FROM `contact` WHERE `uid` = %d AND `self` LIMIT 1", intval($uid));
 
 	if (!$r) {
-		notice(t('Permission denied.') . EOL);
+		notice(L10n::t('Permission denied.') . EOL);
 		goaway($_SESSION['return_url']);
 		// NOTREACHED
 	}
@@ -132,7 +132,7 @@ function follow_content(App $a) {
 		normalise_link($ret["url"]));
 
 	if (!$r) {
-		$r = array(array("location" => "", "about" => "", "keywords" => ""));
+		$r = [["location" => "", "about" => "", "keywords" => ""]];
 	} else {
 		$gcontact_id = $r[0]["id"];
 	}
@@ -144,12 +144,12 @@ function follow_content(App $a) {
 
 	$header = t("Connect/Follow");
 
-	$o  = replace_macros($tpl,array(
+	$o  = replace_macros($tpl,[
 			'$header' => htmlentities($header),
 			//'$photo' => proxy_url($ret["photo"], false, PROXY_SIZE_SMALL),
 			'$desc' => "",
 			'$pls_answer' => t('Please answer the following:'),
-			'$does_know_you' => array('knowyou', sprintf(t('Does %s know you?'),$ret["name"]), false, '', array(t('No'), t('Yes'))),
+			'$does_know_you' => ['knowyou', sprintf(t('Does %s know you?'),$ret["name"]), false, '', [t('No'), t('Yes')]],
 			'$add_note' => t('Add a personal note:'),
 			'$page_desc' => "",
 			'$friendica' => "",
@@ -164,7 +164,7 @@ function follow_content(App $a) {
 			'$nickname' => "",
 			'$name' => $ret["name"],
 			'$url' => $ret["url"],
-			'$zrl' => zrl($ret["url"]),
+			'$zrl' => Profile::zrl($ret["url"]),
 			'$url_label' => t("Profile URL"),
 			'$myaddr' => $myaddr,
 			'$request' => $request,
@@ -174,16 +174,16 @@ function follow_content(App $a) {
 			'$about_label' => t("About:"), */
 			'$keywords' => $r[0]["keywords"],
 			'$keywords_label' => t("Tags:")
-	));
+	]);
 
 	$a->page['aside'] = "";
 
-	profile_load($a, "", 0, Contact::getDetailsByURL($ret["url"]), false);
+	Profile::load($a, "", 0, Contact::getDetailsByURL($ret["url"]), false);
 
 	if ($gcontact_id <> 0) {
 		$o .= replace_macros(get_markup_template('section_title.tpl'),
-						array('$title' => t('Status Messages and Posts')
-		));
+						['$title' => t('Status Messages and Posts')
+		]);
 
 		// Show last public posts
 		$o .= Contact::getPostsFromUrl($ret["url"]);