X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=mod%2Fprofiles.php;h=75023beb64180038cc09c15b20cebaa166efba26;hb=2196a0577b29dcec1ba4d2c32be10fa5f0e91034;hp=dbbdfc83f98fb9f44ede40ae4ba0d0f50eb152d2;hpb=be717649a4c2d7da7804ddaaba21523b90b14b0a;p=friendica.git

diff --git a/mod/profiles.php b/mod/profiles.php
index dbbdfc83f9..75023beb64 100644
--- a/mod/profiles.php
+++ b/mod/profiles.php
@@ -1,6 +1,16 @@
 <?php
-require_once("include/Contact.php");
-require_once('include/Probe.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;
+use Friendica\Object\Profile;
 
 function profiles_init(App $a) {
 
@@ -10,12 +20,12 @@ function profiles_init(App $a) {
 		return;
 	}
 
-	if(($a->argc > 2) && ($a->argv[1] === "drop") && intval($a->argv[2])) {
+	if (($a->argc > 2) && ($a->argv[1] === "drop") && intval($a->argv[2])) {
 		$r = q("SELECT * FROM `profile` WHERE `id` = %d AND `uid` = %d AND `is-default` = 0 LIMIT 1",
 			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
@@ -34,24 +44,22 @@ function profiles_init(App $a) {
 			intval($a->argv[2]),
 			intval(local_user())
 		);
-		if($r)
+		if (DBM::is_result($r)) {
 			info(t('Profile deleted.').EOL);
+		}
 
 		goaway('profiles');
 		return; // NOTREACHED
 	}
 
-
-
-
-
-	if(($a->argc > 1) && ($a->argv[1] === 'new')) {
+	if (($a->argc > 1) && ($a->argv[1] === 'new')) {
 
 		check_form_security_token_redirectOnErr('/profiles', 'profile_new', 't');
 
 		$r0 = q("SELECT `id` FROM `profile` WHERE `uid` = %d",
 			intval(local_user()));
-		$num_profiles = count($r0);
+
+		$num_profiles = (DBM::is_result($r0) ? count($r0) : 0);
 
 		$name = t('Profile-') . ($num_profiles + 1);
 
@@ -73,26 +81,28 @@ function profiles_init(App $a) {
 		);
 
 		info( t('New profile created.') . EOL);
-		if(count($r3) == 1)
-			goaway('profiles/'.$r3[0]['id']);
+		if (DBM::is_result($r3) && count($r3) == 1) {
+			goaway('profiles/' . $r3[0]['id']);
+		}
 
 		goaway('profiles');
 	}
 
-	if(($a->argc > 2) && ($a->argv[1] === 'clone')) {
+	if (($a->argc > 2) && ($a->argv[1] === 'clone')) {
 
 		check_form_security_token_redirectOnErr('/profiles', 'profile_clone', 't');
 
 		$r0 = q("SELECT `id` FROM `profile` WHERE `uid` = %d",
 			intval(local_user()));
-		$num_profiles = count($r0);
+
+		$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;
@@ -103,21 +113,16 @@ function profiles_init(App $a) {
 		$r1[0]['net-publish'] = 0;
 		$r1[0]['profile-name'] = dbesc($name);
 
-		dbm::esc_array($r1[0], true);
-
-		$r2 = dbq("INSERT INTO `profile` (`"
-			. implode("`, `", array_keys($r1[0]))
-			. "`) VALUES ("
-			. implode(", ", array_values($r1[0]))
-			. ")" );
+		dba::insert('profile', $r1[0]);
 
 		$r3 = q("SELECT `id` FROM `profile` WHERE `uid` = %d AND `profile-name` = '%s' LIMIT 1",
 			intval(local_user()),
 			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']);
+		}
 
 		goaway('profiles');
 
@@ -125,18 +130,18 @@ function profiles_init(App $a) {
 	}
 
 
-	if(($a->argc > 1) && (intval($a->argv[1]))) {
+	if (($a->argc > 1) && (intval($a->argv[1]))) {
 		$r = q("SELECT id FROM `profile` WHERE `id` = %d AND `uid` = %d LIMIT 1",
 			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;
 		}
 
-		profile_load($a,$a->user['nickname'],$r[0]['id']);
+		profile_load($a,$a->user['nickname'], $r[0]['id']);
 	}
 
 
@@ -144,15 +149,16 @@ function profiles_init(App $a) {
 }
 
 function profile_clean_keywords($keywords) {
-	$keywords = str_replace(","," ",$keywords);
+	$keywords = str_replace(",", " ", $keywords);
 	$keywords = explode(" ", $keywords);
 
 	$cleaned = array();
 	foreach ($keywords as $keyword) {
 		$keyword = trim(strtolower($keyword));
 		$keyword = trim($keyword, "#");
-		if ($keyword != "")
+		if ($keyword != "") {
 			$cleaned[] = $keyword;
+		}
 	}
 
 	$keywords = implode(", ", $cleaned);
@@ -176,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;
 		}
@@ -191,29 +197,29 @@ function profiles_post(App $a) {
 			return;
 		}
 
-		$dob = $_POST['dob'] ? escape_tags(trim($_POST['dob'])) : '0000-00-00'; // FIXME: Needs to be validated?
+		$dob = $_POST['dob'] ? escape_tags(trim($_POST['dob'])) : '0001-01-01'; // FIXME: Needs to be validated?
 
-		$y = substr($dob,0,4);
+		$y = substr($dob, 0, 4);
 		if ((! ctype_digit($y)) || ($y < 1900)) {
 			$ignore_year = true;
 		} else {
 			$ignore_year = false;
 		}
-		if ($dob != '0000-00-00') {
-			if (strpos($dob,'0000-') === 0) {
+		if (!in_array($dob, array('0000-00-00', '0001-01-01'))) {
+			if (strpos($dob, '0000-') === 0 || strpos($dob, '0001-') === 0) {
 				$ignore_year = true;
 				$dob = substr($dob, 5);
 			}
 			$dob = datetime_convert('UTC', 'UTC', (($ignore_year) ? '1900-' . $dob : $dob), (($ignore_year) ? 'm-d' : 'Y-m-d'));
 
 			if ($ignore_year) {
-				$dob = '0000-' . $dob;
+				$dob = '0001-' . $dob;
 			}
 		}
 
 		$name = notags(trim($_POST['name']));
 
-		if(! strlen($name)) {
+		if (! strlen($name)) {
 			$name = '[No Name]';
 		}
 
@@ -235,10 +241,10 @@ function profiles_post(App $a) {
 
 		$with = ((x($_POST,'with')) ? notags(trim($_POST['with'])) : '');
 
-		if(! strlen($howlong)) {
+		if (! strlen($howlong)) {
 			$howlong = NULL_DATE;
 		} else {
-			$howlong = datetime_convert(date_default_timezone_get(),'UTC',$howlong);
+			$howlong = datetime_convert(date_default_timezone_get(), 'UTC', $howlong);
 		}
 		// linkify the relationship target if applicable
 
@@ -249,7 +255,7 @@ function profiles_post(App $a) {
 				$withchanged = true;
 				$prf = '';
 				$lookup = $with;
-				if (strpos($lookup,'@') === 0) {
+				if (strpos($lookup, '@') === 0) {
 					$lookup = substr($lookup, 1);
 				}
 				$lookup = str_replace('_',' ', $lookup);
@@ -270,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'];
 					}
@@ -321,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 = '';
@@ -465,7 +471,6 @@ function profiles_post(App $a) {
 			intval(local_user())
 		);
 
-		/// @TODO decide to use dbm::is_result() here and check $r
 		if ($r) {
 			info(t('Profile updated.') . EOL);
 		}
@@ -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,15 +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);
 			}
 
-			require_once('include/profile_update.php');
-			profile_change();
+			Worker::add(PRIORITY_LOW, 'ProfileUpdate', local_user());
 
 			// Update the global contact for the user
-			update_gcontact_for_user(local_user());
+			GlobalContact::updateForUser(local_user());
 		}
 	}
 }
@@ -517,21 +521,21 @@ 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;
 	}
 
-	require_once('include/items.php');
+	require_once 'include/items.php';
 
 	$self = q("SELECT * FROM `contact` WHERE `self` = 1 AND `uid` = %d LIMIT 1",
 		intval(local_user())
 	);
 
-	if (! dbm::is_result($self)) {
+	if (! DBM::is_result($self)) {
 		return;
 	}
 
@@ -595,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);
 	}
 }
 
@@ -614,19 +618,19 @@ 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;
 		}
 
-		require_once('include/profile_selectors.php');
+		require_once 'include/profile_selectors.php';
 
 
 		$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");
@@ -636,7 +640,7 @@ function profiles_content(App $a) {
 				t('Hide contacts and friends:'), //Label
 				!!$r[0]['hide-friends'], //Value
 				'', //Help string
-				array(t('No'),t('Yes')) //Off - On strings
+				array(t('No'), t('Yes')) //Off - On strings
 			),
 			'$desc' => t('Hide your contact/friend list from viewers of this profile?'),
 			'$yes_str' => t('Yes'),
@@ -648,11 +652,12 @@ 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');
-		if(! $f)
+		$f = Config::get('system', 'birthday_input_format');
+		if (! $f) {
 			$f = 'ymd';
+		}
 
 		$is_default = (($r[0]['is-default']) ? 1 : 0);
 		$tpl = get_markup_template("profile_edit.tpl");
@@ -668,10 +673,10 @@ function profiles_content(App $a) {
 				array(t('No'), t('Yes')) //Off - On strings
 			),
 
-			'$multi_profiles'		=> feature_enabled(local_user(),'multi_profiles'),
+			'$multi_profiles'		=> feature_enabled(local_user(), 'multi_profiles'),
 			'$form_security_token'		=> get_form_security_token("profile_edit"),
 			'$form_security_token_photo'	=> get_form_security_token("profile_photo"),
-			'$profile_clone_link'		=> ((feature_enabled(local_user(),'multi_profiles')) ? 'profiles/clone/' . $r[0]['id'] . '?t=' . get_form_security_token("profile_clone") : ""),
+			'$profile_clone_link'		=> ((feature_enabled(local_user(), 'multi_profiles')) ? 'profiles/clone/' . $r[0]['id'] . '?t=' . get_form_security_token("profile_clone") : ""),
 			'$profile_drop_link'		=> 'profiles/drop/' . $r[0]['id'] . '?t=' . get_form_security_token("profile_drop"),
 
 			'$profile_action' => t('Profile Actions'),
@@ -702,7 +707,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,
@@ -737,7 +742,7 @@ function profiles_content(App $a) {
 			'$tv' => array('tv', t('Television'), $r[0]['tv']),
 			'$film' => array('film', t('Film/dance/culture/entertainment'), $r[0]['film']),
 			'$interest' => array('interest', t('Hobbies/Interests'), $r[0]['interest']),
-			'$romance' => array('romance',t('Love/romance'), $r[0]['romance']),
+			'$romance' => array('romance', t('Love/romance'), $r[0]['romance']),
 			'$work' => array('work', t('Work/employment'), $r[0]['work']),
 			'$education' => array('education', t('School/education'), $r[0]['education']),
 			'$contact' => array('contact', t('Contact information and Social Networks'), $r[0]['contact']),
@@ -748,22 +753,21 @@ 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')){
+		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']);
+				goaway('profiles/' . $r[0]['id']);
 			}
 		}
 
 		$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');