X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=include%2Fidentity.php;h=3686b23d2d312473a9ffe19cad04f100aee67184;hb=26d7cf1d6a03840bd6645ceb514ee92620a65485;hp=44194c2faeb44be6dc869e2a4e56a0a0add7e335;hpb=1d8c91c47871d87df7c20481b69963409556f9cf;p=friendica.git

diff --git a/include/identity.php b/include/identity.php
index 44194c2fae..3686b23d2d 100644
--- a/include/identity.php
+++ b/include/identity.php
@@ -4,6 +4,7 @@
  */
 
 use Friendica\App;
+use Friendica\Core\System;
 
 require_once 'include/ForumManager.php';
 require_once 'include/bbcode.php';
@@ -49,7 +50,7 @@ function profile_load(App $a, $nickname, $profile = 0, $profiledata = array()) {
 
 	$pdata = get_profiledata_by_nick($nickname, $user[0]['uid'], $profile);
 
-	if (($pdata === false) || (!count($pdata)) && !count($profiledata)) {
+	if (empty($pdata) && empty($profiledata)) {
 		logger('profile error: ' . $a->query_string, LOGGER_DEBUG);
 		notice( t('Requested profile is not available.') . EOL );
 		$a->error = 404;
@@ -242,10 +243,12 @@ 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"]);
 		}
 
-		$connect = !dba::exists('contact', array('pending' => false, 'uid' => local_user(), 'nurl' => $profile_url));
+		if (dba::exists('contact', array('pending' => false, 'uid' => local_user(), 'nurl' => $profile_url))) {
+			$connect = false;
+		}
 	}
 
 	if ($connect && ($profile['network'] != NETWORK_DFRN) && !isset($profile['remoteconnect']))
@@ -287,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());
 
@@ -316,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,
@@ -357,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'],
@@ -507,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;
@@ -521,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'),
@@ -553,7 +556,7 @@ function get_events() {
 	$bd_format = t('g A l F d') ; // 8 AM Friday January 18
 	$bd_short = t('F d');
 
-	$r = dba::p("SELECT `event`.* FROM `event`
+	$s = dba::p("SELECT `event`.* FROM `event`
 			WHERE `event`.`uid` = ? AND `type` != 'birthday' AND `start` < ? AND `start` >= ?
 			ORDER BY `start` ASC ",
 			local_user(),
@@ -561,12 +564,13 @@ function get_events() {
 			datetime_convert('UTC','UTC','now - 1 days')
 	);
 
-	if (dbm::is_result($r)) {
+	$r = array();
+
+	if (dbm::is_result($s)) {
 		$now = strtotime('now');
 		$istoday = false;
-		$skip = 0;
 
-		while ($rr = dba::fetch($r)) {
+		while ($rr = dba::fetch($s)) {
 			if (strlen($rr['name'])) {
 				$total ++;
 			}
@@ -590,7 +594,6 @@ function get_events() {
 			$strt = datetime_convert('UTC',$rr['convert'] ? $a->timezone : 'UTC',$rr['start']);
 
 			if (substr($strt,0,10) < datetime_convert('UTC',$a->timezone,'now','Y-m-d')) {
-				$skip++;
 				continue;
 			}
 
@@ -601,16 +604,17 @@ function get_events() {
 			$rr['date'] = day_translate(datetime_convert('UTC', $rr['adjust'] ? $a->timezone : 'UTC', $rr['start'], $bd_format)) . (($today) ?  ' ' . t('[today]') : '');
 			$rr['startime'] = $strt;
 			$rr['today'] = $today;
+
+			$r[] = $rr;
 		}
-		dba::close($r);
+		dba::close($s);
 		$classtoday = (($istoday) ? 'event-today' : '');
 	}
-
 	$tpl = get_markup_template("events_reminder.tpl");
 	return replace_macros($tpl, array(
-		'$baseurl' => App::get_baseurl(),
+		'$baseurl' => System::baseUrl(),
 		'$classtoday' => $classtoday,
-		'$count' => count($r) - $skip,
+		'$count' => count($r),
 		'$event_reminders' => t('Event Reminders'),
 		'$event_title' => t('Events this week:'),
 		'$events' => $r,
@@ -748,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(
@@ -773,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(
@@ -794,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',
@@ -802,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',
@@ -814,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',
@@ -825,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',
@@ -836,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',
@@ -847,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',