X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=mod%2Fnotes.php;h=6ecc819240ff67d817f27dc9ee91c7aa540d61ec;hb=0cdf0ba422076f731a5801708879d5344439494a;hp=c02f0a759e298e2dd37cf5cb3808d4449a4e408a;hpb=286811357ab86bc73a5b6b0fd92bdcef1ea55c08;p=friendica.git

diff --git a/mod/notes.php b/mod/notes.php
index c02f0a759e..6ecc819240 100644
--- a/mod/notes.php
+++ b/mod/notes.php
@@ -2,13 +2,17 @@
 /**
  * @file mod/notes.php
  */
+
 use Friendica\App;
 use Friendica\Content\Nav;
-use Friendica\Database\DBM;
+use Friendica\Content\Pager;
+use Friendica\Core\L10n;
+use Friendica\Database\DBA;
+use Friendica\Model\Item;
 use Friendica\Model\Profile;
 
-function notes_init(App $a) {
-
+function notes_init(App $a)
+{
 	if (! local_user()) {
 		return;
 	}
@@ -20,44 +24,23 @@ function notes_init(App $a) {
 	Nav::setSelected('home');
 
 	//Profile::load($a, $which, $profile);
-
 }
 
 
-function notes_content(App $a, $update = false) {
-
-	if (! local_user()) {
-		notice( t('Permission denied.') . EOL);
+function notes_content(App $a, $update = false)
+{
+	if (!local_user()) {
+		notice(L10n::t('Permission denied.') . EOL);
 		return;
 	}
 
-	require_once("include/bbcode.php");
-	require_once('include/security.php');
-	require_once('include/conversation.php');
-	require_once('include/acl_selectors.php');
-	$groups = [];
-
-
-	$o = '';
+	$o = Profile::getTabs($a, true);
 
-	$remote_contact = false;
-
-	$contact_id = $_SESSION['cid'];
-	$contact = $a->contact;
-
-	$is_owner = true;
-
-	$o ="";
-	$o .= Profile::getTabs($a, true);
-
-	if(! $update) {
-		$o .= '<h3>' . t('Personal Notes') . '</h3>';
-
-		$commpage = false;
-		$commvisitor = false;
+	if (!$update) {
+		$o .= '<h3>' . 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'],
@@ -66,72 +49,33 @@ function notes_content(App $a, $update = false) {
 			'bang' => '',
 			'visitor' => 'block',
 			'profile_uid' => local_user(),
-			'button' => t('Save'),
+			'button' => L10n::t('Save'),
 			'acl_data' => '',
 		];
 
-		$o .= status_editor($a,$x,$a->contact['id']);
-
+		$o .= status_editor($a, $x, $a->contact['id']);
 	}
 
-	// Construct permissions
+	$condition = ['uid' => local_user(), 'post-type' => Item::PT_PERSONAL_NOTE, 'gravity' => GRAVITY_PARENT,
+		'contact-id'=> $a->contact['id']];
 
-	// default permissions - anonymous user
+	$pager = new Pager($a->query_string, 40);
 
-	$sql_extra = " AND `item`.`allow_cid` = '<" . $a->contact['id'] . ">' ";
+	$params = ['order' => ['created' => true],
+		'limit' => [$pager->getStart(), $pager->getItemsPerPage()]];
+	$r = Item::selectThreadForUser(local_user(), ['uri'], $condition, $params);
 
-	$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(), item_condition(),
-		intval(local_user())
+	$count = 0;
 
-	);
+	if (DBA::isResult($r)) {
+		$notes = Item::inArray($r);
 
-	if (DBM::is_result($r)) {
-		$a->set_pager_total($r[0]['total']);
-		$a->set_pager_itemspage(40);
-	}
+		$count = count($notes);
 
-	$r = q("SELECT `item`.`id` AS `item_id` FROM `item` %s
-		WHERE %s AND `item`.`uid` = %d AND `item`.`type` = 'note'
-		AND `item`.`id` = `item`.`parent` AND NOT `item`.`wall`
-		$sql_extra
-		ORDER BY `item`.`created` DESC LIMIT %d ,%d ",
-		item_joins(), item_condition(),
-		intval(local_user()),
-		intval($a->pager['start']),
-		intval($a->pager['itemspage'])
-
-	);
-
-	$parents_arr = [];
-	$parents_str = '';
-
-	if (DBM::is_result($r)) {
-		foreach($r as $rr)
-			$parents_arr[] = $rr['item_id'];
-		$parents_str = implode(', ', $parents_arr);
-
-		$r = q("SELECT %s FROM `item` %s
-			WHERE %s AND `item`.`uid` = %d AND `item`.`parent` IN (%s)
-			$sql_extra
-			ORDER BY `parent` DESC, `gravity` ASC, `item`.`id` ASC ",
-			item_fieldlists(), item_joins(), item_condition(),
-			intval(local_user()),
-			dbesc($parents_str)
-		);
-
-		if (DBM::is_result($r)) {
-			$items = conv_sort($r,"`commented`");
-
-			$o .= conversation($a,$items,'notes',$update);
-		}
+		$o .= conversation($a, $notes, $pager, 'notes', $update);
 	}
 
+	$o .= $pager->renderMinimal($count);
 
-	$o .= paginate($a);
 	return $o;
 }