X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=mod%2Fprofiles.php;h=75023beb64180038cc09c15b20cebaa166efba26;hb=de4a2e6fd03cd0aab94a256eba92ed593931534b;hp=4a1d1ad93479033342ec504ff7cfa949b3f0ce78;hpb=a0530d1066d7268f1b1ea67bc3c254e9f9fc5ec8;p=friendica.git

diff --git a/mod/profiles.php b/mod/profiles.php
index 4a1d1ad934..75023beb64 100644
--- a/mod/profiles.php
+++ b/mod/profiles.php
@@ -1,11 +1,16 @@
 <?php
-
+/**
+ * @file mod/profiles.php
+ */
 use Friendica\App;
+use Friendica\Core\Config;
+use Friendica\Core\PConfig;
 use Friendica\Core\System;
+use Friendica\Core\Worker;
+use Friendica\Database\DBM;
+use Friendica\Model\GlobalContact;
 use Friendica\Network\Probe;
-
-require_once 'include/Contact.php';
-require_once 'include/socgraph.php';
+use Friendica\Object\Profile;
 
 function profiles_init(App $a) {
 
@@ -20,7 +25,7 @@ function profiles_init(App $a) {
 			intval($a->argv[2]),
 			intval(local_user())
 		);
-		if (! dbm::is_result($r)) {
+		if (! DBM::is_result($r)) {
 			notice( t('Profile not found.') . EOL);
 			goaway('profiles');
 			return; // NOTREACHED
@@ -39,7 +44,7 @@ function profiles_init(App $a) {
 			intval($a->argv[2]),
 			intval(local_user())
 		);
-		if (dbm::is_result($r)) {
+		if (DBM::is_result($r)) {
 			info(t('Profile deleted.').EOL);
 		}
 
@@ -54,7 +59,7 @@ function profiles_init(App $a) {
 		$r0 = q("SELECT `id` FROM `profile` WHERE `uid` = %d",
 			intval(local_user()));
 
-		$num_profiles = (dbm::is_result($r0) ? count($r0) : 0);
+		$num_profiles = (DBM::is_result($r0) ? count($r0) : 0);
 
 		$name = t('Profile-') . ($num_profiles + 1);
 
@@ -76,7 +81,7 @@ function profiles_init(App $a) {
 		);
 
 		info( t('New profile created.') . EOL);
-		if (dbm::is_result($r3) && count($r3) == 1) {
+		if (DBM::is_result($r3) && count($r3) == 1) {
 			goaway('profiles/' . $r3[0]['id']);
 		}
 
@@ -90,14 +95,14 @@ function profiles_init(App $a) {
 		$r0 = q("SELECT `id` FROM `profile` WHERE `uid` = %d",
 			intval(local_user()));
 
-		$num_profiles = (dbm::is_result($r0) ? count($r0) : 0);
+		$num_profiles = (DBM::is_result($r0) ? count($r0) : 0);
 
 		$name = t('Profile-') . ($num_profiles + 1);
 		$r1 = q("SELECT * FROM `profile` WHERE `uid` = %d AND `id` = %d LIMIT 1",
 			intval(local_user()),
 			intval($a->argv[2])
 		);
-		if(! dbm::is_result($r1)) {
+		if(! DBM::is_result($r1)) {
 			notice( t('Profile unavailable to clone.') . EOL);
 			killme();
 			return;
@@ -115,7 +120,7 @@ function profiles_init(App $a) {
 			dbesc($name)
 		);
 		info( t('New profile created.') . EOL);
-		if ((dbm::is_result($r3)) && (count($r3) == 1)) {
+		if ((DBM::is_result($r3)) && (count($r3) == 1)) {
 			goaway('profiles/'.$r3[0]['id']);
 		}
 
@@ -130,7 +135,7 @@ function profiles_init(App $a) {
 			intval($a->argv[1]),
 			intval(local_user())
 		);
-		if (! dbm::is_result($r)) {
+		if (! DBM::is_result($r)) {
 			notice( t('Profile not found.') . EOL);
 			killme();
 			return;
@@ -177,7 +182,7 @@ function profiles_post(App $a) {
 			intval($a->argv[1]),
 			intval(local_user())
 		);
-		if (! dbm::is_result($orig)) {
+		if (! DBM::is_result($orig)) {
 			notice( t('Profile not found.') . EOL);
 			return;
 		}
@@ -271,13 +276,13 @@ function profiles_post(App $a) {
 						dbesc($newname),
 						intval(local_user())
 					);
-					if (! dbm::is_result($r)) {
+					if (! DBM::is_result($r)) {
 						$r = q("SELECT * FROM `contact` WHERE `nick` = '%s' AND `uid` = %d LIMIT 1",
 							dbesc($lookup),
 							intval(local_user())
 						);
 					}
-					if (dbm::is_result($r)) {
+					if (DBM::is_result($r)) {
 						$prf = $r[0]['url'];
 						$newname = $r[0]['name'];
 					}
@@ -322,7 +327,7 @@ function profiles_post(App $a) {
 
 		$hide_friends = (($_POST['hide-friends'] == 1) ? 1: 0);
 
-		set_pconfig(local_user(), 'system', 'detailled_profile', (($_POST['detailled_profile'] == 1) ? 1: 0));
+		PConfig::set(local_user(), 'system', 'detailled_profile', (($_POST['detailled_profile'] == 1) ? 1: 0));
 
 		$changes = array();
 		$value = '';
@@ -484,7 +489,7 @@ function profiles_post(App $a) {
 		}
 
 		if ($is_default) {
-			$location = formatted_location(array("locality" => $locality, "region" => $region, "country-name" => $country_name));
+			$location = Profile::formatLocation(array("locality" => $locality, "region" => $region, "country-name" => $country_name));
 
 			q("UPDATE `contact` SET `about` = '%s', `location` = '%s', `keywords` = '%s', `gender` = '%s' WHERE `self` AND `uid` = %d",
 				dbesc($about),
@@ -496,14 +501,14 @@ function profiles_post(App $a) {
 
 			// Update global directory in background
 			$url = $_SESSION['my_url'];
-			if ($url && strlen(get_config('system', 'directory'))) {
-				proc_run(PRIORITY_LOW, "include/directory.php", $url);
+			if ($url && strlen(Config::get('system', 'directory'))) {
+				Worker::add(PRIORITY_LOW, "Directory", $url);
 			}
 
-			proc_run(PRIORITY_LOW, 'include/profile_update.php', local_user());
+			Worker::add(PRIORITY_LOW, 'ProfileUpdate', local_user());
 
 			// Update the global contact for the user
-			update_gcontact_for_user(local_user());
+			GlobalContact::updateForUser(local_user());
 		}
 	}
 }
@@ -516,11 +521,11 @@ function profile_activity($changed, $value) {
 		return;
 	}
 
-	if ($a->user['hidewall'] || get_config('system', 'block_public')) {
+	if ($a->user['hidewall'] || Config::get('system', 'block_public')) {
 		return;
 	}
 
-	if (! get_pconfig(local_user(), 'system', 'post_profilechange')) {
+	if (! PConfig::get(local_user(), 'system', 'post_profilechange')) {
 		return;
 	}
 
@@ -530,7 +535,7 @@ function profile_activity($changed, $value) {
 		intval(local_user())
 	);
 
-	if (! dbm::is_result($self)) {
+	if (! DBM::is_result($self)) {
 		return;
 	}
 
@@ -594,7 +599,7 @@ function profile_activity($changed, $value) {
 
 	$i = item_store($arr);
 	if ($i) {
-		proc_run(PRIORITY_HIGH, "include/notifier.php", "activity", $i);
+		Worker::add(PRIORITY_HIGH, "Notifier", "activity", $i);
 	}
 }
 
@@ -613,7 +618,7 @@ function profiles_content(App $a) {
 			intval($a->argv[1]),
 			intval(local_user())
 		);
-		if (! dbm::is_result($r)) {
+		if (! DBM::is_result($r)) {
 			notice( t('Profile not found.') . EOL);
 			return;
 		}
@@ -647,9 +652,9 @@ function profiles_content(App $a) {
 		$personal_account = !(in_array($a->user["page-flags"],
 					array(PAGE_COMMUNITY, PAGE_PRVGROUP)));
 
-		$detailled_profile = (get_pconfig(local_user(), 'system', 'detailled_profile') AND $personal_account);
+		$detailled_profile = (PConfig::get(local_user(), 'system', 'detailled_profile') AND $personal_account);
 
-		$f = get_config('system', 'birthday_input_format');
+		$f = Config::get('system', 'birthday_input_format');
 		if (! $f) {
 			$f = 'ymd';
 		}
@@ -748,13 +753,12 @@ function profiles_content(App $a) {
 
 		return $o;
 	} else {
-
 		// If we don't support multi profiles, don't display this list.
 		if (!feature_enabled(local_user(), 'multi_profiles')) {
 			$r = q("SELECT * FROM `profile` WHERE `uid` = %d AND `is-default`=1",
 				local_user()
 			);
-			if (dbm::is_result($r)) {
+			if (DBM::is_result($r)) {
 				//Go to the default profile.
 				goaway('profiles/' . $r[0]['id']);
 			}
@@ -763,7 +767,7 @@ function profiles_content(App $a) {
 		$r = q("SELECT * FROM `profile` WHERE `uid` = %d",
 			local_user());
 
-		if (dbm::is_result($r)) {
+		if (DBM::is_result($r)) {
 
 			$tpl = get_markup_template('profile_entry.tpl');