X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=mod%2Fnotes.php;h=38a72a741fd7e4ba2c3a0bfe62ab22034687fa79;hb=589b7e718da0a1eb5f9f6e86e091307c399e0df6;hp=be9fe0d70a916492837982831cd0cc99b7d77d07;hpb=8375d4ac4cb32fa7de3bfe14c061bde266b822ad;p=friendica.git

diff --git a/mod/notes.php b/mod/notes.php
index be9fe0d70a..38a72a741f 100644
--- a/mod/notes.php
+++ b/mod/notes.php
@@ -2,12 +2,14 @@
 /**
  * @file mod/notes.php
  */
+
 use Friendica\App;
 use Friendica\Content\Nav;
-use Friendica\Core\L10n;
-use Friendica\Database\DBM;
-use Friendica\Model\Profile;
+use Friendica\Content\Pager;
+use Friendica\Database\DBA;
+use Friendica\DI;
 use Friendica\Model\Item;
+use Friendica\Module\BaseProfile;
 
 function notes_init(App $a)
 {
@@ -15,48 +17,24 @@ function notes_init(App $a)
 		return;
 	}
 
-	$profile = 0;
-
-	$which = $a->user['nickname'];
-
 	Nav::setSelected('home');
-
-	//Profile::load($a, $which, $profile);
 }
 
 
 function notes_content(App $a, $update = false)
 {
-	if (! local_user()) {
-		notice(L10n::t('Permission denied.') . EOL);
+	if (!local_user()) {
+		notice(DI::l10n()->t('Permission denied.') . EOL);
 		return;
 	}
 
-	require_once 'include/security.php';
-	require_once 'include/conversation.php';
-	$groups = [];
-
-
-	$o = '';
-
-	$remote_contact = false;
-
-	$contact_id = $_SESSION['cid'];
-	$contact = $a->contact;
-
-	$is_owner = true;
-
-	$o ="";
-	$o .= Profile::getTabs($a, true);
+	$o = BaseProfile::getTabsHTML($a, 'notes', true);
 
 	if (!$update) {
-		$o .= '<h3>' . L10n::t('Personal Notes') . '</h3>';
-
-		$commpage = false;
-		$commvisitor = false;
+		$o .= '<h3>' . DI::l10n()->t('Personal Notes') . '</h3>';
 
 		$x = [
-			'is_owner' => $is_owner,
+			'is_owner' => true,
 			'allow_location' => (($a->user['allow_location']) ? true : false),
 			'default_location' => $a->user['default-location'],
 			'nickname' => $a->user['nickname'],
@@ -65,59 +43,33 @@ function notes_content(App $a, $update = false)
 			'bang' => '',
 			'visitor' => 'block',
 			'profile_uid' => local_user(),
-			'button' => L10n::t('Save'),
+			'button' => DI::l10n()->t('Save'),
 			'acl_data' => '',
 		];
 
 		$o .= status_editor($a, $x, $a->contact['id']);
 	}
 
-	// Construct permissions
-
-	// default permissions - anonymous user
+	$condition = ['uid' => local_user(), 'post-type' => Item::PT_PERSONAL_NOTE, 'gravity' => GRAVITY_PARENT,
+		'contact-id'=> $a->contact['id']];
 
-	$sql_extra = " AND `item`.`allow_cid` = '<" . $a->contact['id'] . ">' ";
+	$pager = new Pager(DI::args()->getQueryString(), 40);
 
-	/// @todo We seem to need "Item::count" as function as well
-	$r = q("SELECT COUNT(*) AS `total`
-		FROM `item` %s
-		WHERE %s AND `item`.`uid` = %d AND `item`.`type` = 'note'
-		AND `contact`.`self` AND `item`.`id` = `item`.`parent` AND NOT `item`.`wall`
-		$sql_extra ",
-		item_joins(local_user()),
-		item_condition(),
-		intval(local_user())
-	);
-
-	if (DBM::is_result($r)) {
-		$a->set_pager_total($r[0]['total']);
-		$a->set_pager_itemspage(40);
-	}
-
-	$condition = ["`uid` = ? AND `type` = 'note' AND NOT `wall`
-		AND `id` = `parent` AND `allow_cid` = ?",
-		local_user(), '<' . $a->contact['id'] . '>'];
 	$params = ['order' => ['created' => true],
-		'limit' => [$a->pager['start'], $a->pager['itemspage']]];
+		'limit' => [$pager->getStart(), $pager->getItemsPerPage()]];
+	$r = Item::selectThreadForUser(local_user(), ['uri'], $condition, $params);
 
-	$r = Item::select(local_user(), ['item_id'], $condition, $params);
+	$count = 0;
 
-	if (DBM::is_result($r)) {
-		$parents_arr = [];
+	if (DBA::isResult($r)) {
+		$notes = Item::inArray($r);
 
-		while ($rr = dba::fetch($r)) {
-			$parents_arr[] = $rr['item_id'];
-		}
-		dba::close($r);
+		$count = count($notes);
 
-		$condition = ['uid' => local_user(), 'parent' => $parents_arr];
-		$result = Item::select(local_user(), [], $condition);
-		if (DBM::is_result($result)) {
-			$items = conv_sort(dba::inArray($result), 'commented');
-			$o .= conversation($a, $items, 'notes', $update);
-		}
+		$o .= conversation($a, $notes, $pager, 'notes', $update);
 	}
 
-	$o .= paginate($a);
+	$o .= $pager->renderMinimal($count);
+
 	return $o;
 }