X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=include%2Fitems.php;h=8dd6793d2cf097af817175314672b5b1589f27de;hb=e84ad1556926acfebadfb70fd3161a0bc9ef4c6d;hp=88eec1dc48794de8faa89f91ac80aeaaedf91ac0;hpb=85ff976f83b1037328fedd26fd817c720625e0e9;p=friendica.git

diff --git a/include/items.php b/include/items.php
index 88eec1dc48..8dd6793d2c 100644
--- a/include/items.php
+++ b/include/items.php
@@ -3,28 +3,26 @@
  * @file include/items.php
  */
 
-use Friendica\BaseObject;
-use Friendica\Content\Feature;
 use Friendica\Core\Config;
 use Friendica\Core\Hook;
 use Friendica\Core\L10n;
 use Friendica\Core\Logger;
-use Friendica\Core\PConfig;
 use Friendica\Core\Protocol;
 use Friendica\Core\Renderer;
 use Friendica\Core\System;
+use Friendica\Core\Session;
 use Friendica\Database\DBA;
+use Friendica\DI;
 use Friendica\Model\Item;
 use Friendica\Protocol\DFRN;
 use Friendica\Protocol\Feed;
 use Friendica\Protocol\OStatus;
-use Friendica\Util\DateTimeFormat;
 use Friendica\Util\Network;
 use Friendica\Util\ParseUrl;
 use Friendica\Util\Strings;
-use Friendica\Util\Temporal;
 
-require_once 'mod/share.php';
+require_once __DIR__ . '/../mod/share.php';
+
 function add_page_info_data(array $data, $no_photos = false)
 {
 	Hook::callAll('page_info_data', $data);
@@ -40,7 +38,7 @@ function add_page_info_data(array $data, $no_photos = false)
 		$data["type"] = "link";
 	}
 
-	$data["title"] = defaults($data, "title", "");
+	$data["title"] = $data["title"] ?? '';
 
 	if ((($data["type"] != "link") && ($data["type"] != "video") && ($data["type"] != "photo")) || ($data["title"] == $data["url"])) {
 		return "";
@@ -325,7 +323,7 @@ function drop_items(array $items)
 {
 	$uid = 0;
 
-	if (!local_user() && !remote_user()) {
+	if (!Session::isAuthenticated()) {
 		return;
 	}
 
@@ -342,7 +340,7 @@ function drop_items(array $items)
 
 function drop_item($id, $return = '')
 {
-	$a = BaseObject::getApp();
+	$a = DI::app();
 
 	// locate item to be deleted
 
@@ -351,7 +349,7 @@ function drop_item($id, $return = '')
 
 	if (!DBA::isResult($item)) {
 		notice(L10n::t('Item not found.') . EOL);
-		$a->internalRedirect('network');
+		DI::baseUrl()->redirect('network');
 	}
 
 	if ($item['deleted']) {
@@ -361,14 +359,8 @@ function drop_item($id, $return = '')
 	$contact_id = 0;
 
 	// check if logged in user is either the author or owner of this item
-
-	if (!empty($_SESSION['remote'])) {
-		foreach ($_SESSION['remote'] as $visitor) {
-			if ($visitor['uid'] == $item['uid'] && $visitor['cid'] == $item['contact-id']) {
-				$contact_id = $visitor['cid'];
-				break;
-			}
-		}
+	if (Session::getRemoteContactID($item['uid']) == $item['contact-id']) {
+		$contact_id = $item['contact-id'];
 	}
 
 	if ((local_user() == $item['uid']) || $contact_id) {
@@ -376,7 +368,7 @@ function drop_item($id, $return = '')
 		if (!empty($_REQUEST['confirm'])) {
 			// <form> can't take arguments in its "action" parameter
 			// so add any arguments as hidden inputs
-			$query = explode_querystring($a->query_string);
+			$query = explode_querystring(DI::args()->getQueryString());
 			$inputs = [];
 
 			foreach ($query['args'] as $arg) {
@@ -398,7 +390,7 @@ function drop_item($id, $return = '')
 		}
 		// Now check how the user responded to the confirmation query
 		if (!empty($_REQUEST['canceled'])) {
-			$a->internalRedirect('display/' . $item['guid']);
+			DI::baseUrl()->redirect('display/' . $item['guid']);
 		}
 
 		$is_comment = ($item['gravity'] == GRAVITY_COMMENT) ? true : false;
@@ -420,105 +412,28 @@ function drop_item($id, $return = '')
 		if ($is_comment) {
 			// Return to parent guid
 			if (!empty($parentitem)) {
-				$a->internalRedirect('display/' . $parentitem['guid']);
+				DI::baseUrl()->redirect('display/' . $parentitem['guid']);
 				//NOTREACHED
 			}
 			// In case something goes wrong
 			else {
-				$a->internalRedirect('network');
+				DI::baseUrl()->redirect('network');
 				//NOTREACHED
 			}
 		}
 		else {
 			// if unknown location or deleting top level post called from display
 			if (empty($return_url) || strpos($return_url, 'display') !== false) {
-				$a->internalRedirect('network');
+				DI::baseUrl()->redirect('network');
 				//NOTREACHED
 			} else {
-				$a->internalRedirect($return_url);
+				DI::baseUrl()->redirect($return_url);
 				//NOTREACHED
 			}
 		}
 	} else {
 		notice(L10n::t('Permission denied.') . EOL);
-		$a->internalRedirect('display/' . $item['guid']);
+		DI::baseUrl()->redirect('display/' . $item['guid']);
 		//NOTREACHED
 	}
 }
-
-/* arrange the list in years */
-function list_post_dates($uid, $wall)
-{
-	$dnow = DateTimeFormat::localNow('Y-m-d');
-
-	$dthen = Item::firstPostDate($uid, $wall);
-	if (!$dthen) {
-		return [];
-	}
-
-	// Set the start and end date to the beginning of the month
-	$dnow = substr($dnow, 0, 8) . '01';
-	$dthen = substr($dthen, 0, 8) . '01';
-
-	$ret = [];
-
-	/*
-	 * Starting with the current month, get the first and last days of every
-	 * month down to and including the month of the first post
-	 */
-	while (substr($dnow, 0, 7) >= substr($dthen, 0, 7)) {
-		$dyear = intval(substr($dnow, 0, 4));
-		$dstart = substr($dnow, 0, 8) . '01';
-		$dend = substr($dnow, 0, 8) . Temporal::getDaysInMonth(intval($dnow), intval(substr($dnow, 5)));
-		$start_month = DateTimeFormat::utc($dstart, 'Y-m-d');
-		$end_month = DateTimeFormat::utc($dend, 'Y-m-d');
-		$str = L10n::getDay(DateTimeFormat::utc($dnow, 'F'));
-
-		if (empty($ret[$dyear])) {
-			$ret[$dyear] = [];
-		}
-
-		$ret[$dyear][] = [$str, $end_month, $start_month];
-		$dnow = DateTimeFormat::utc($dnow . ' -1 month', 'Y-m-d');
-	}
-	return $ret;
-}
-
-function posted_date_widget($url, $uid, $wall)
-{
-	$o = '';
-
-	if (!Feature::isEnabled($uid, 'archives')) {
-		return $o;
-	}
-
-	// For former Facebook folks that left because of "timeline"
-	/*
-	 * @TODO old-lost code?
-	if ($wall && intval(PConfig::get($uid, 'system', 'no_wall_archive_widget')))
-		return $o;
-	*/
-
-	$visible_years = PConfig::get($uid, 'system', 'archive_visible_years', 5);
-
-	$ret = list_post_dates($uid, $wall);
-
-	if (!DBA::isResult($ret)) {
-		return $o;
-	}
-
-	$cutoff_year = intval(DateTimeFormat::localNow('Y')) - $visible_years;
-	$cutoff = ((array_key_exists($cutoff_year, $ret))? true : false);
-
-	$o = Renderer::replaceMacros(Renderer::getMarkupTemplate('posted_date_widget.tpl'),[
-		'$title' => L10n::t('Archives'),
-		'$size' => $visible_years,
-		'$cutoff_year' => $cutoff_year,
-		'$cutoff' => $cutoff,
-		'$url' => $url,
-		'$dates' => $ret,
-		'$showmore' => L10n::t('show more')
-
-	]);
-	return $o;
-}