X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=mod%2Fnotes.php;h=69b544472f6bba4013659fc3087ce6be29f9e75e;hb=4b0cf8d60f05c44f72b39bae1caae63284aacf44;hp=b2aa5487af963e60d1b456dbf39ec1b258b20aea;hpb=cbc32143d7c9a70fa89238e5a75a22c4b8eacc41;p=friendica.git

diff --git a/mod/notes.php b/mod/notes.php
index b2aa5487af..69b544472f 100644
--- a/mod/notes.php
+++ b/mod/notes.php
@@ -1,7 +1,16 @@
 <?php
-
-function notes_init(App &$a) {
-
+/**
+ * @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\Model\Item;
+
+function notes_init(App $a)
+{
 	if (! local_user()) {
 		return;
 	}
@@ -10,47 +19,29 @@ function notes_init(App &$a) {
 
 	$which = $a->user['nickname'];
 
-	nav_set_selected('home');
-
-//	profile_load($a,$which,$profile);
+	Nav::setSelected('home');
 
+	//Profile::load($a, $which, $profile);
 }
 
 
-function notes_content(&$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 = array();
-
-
-	$o = '';
-
-	$remote_contact = false;
-
-	$contact_id = $_SESSION['cid'];
-	$contact = $a->contact;
-
-	$is_owner = true;
-
-	$o ="";
-	$o .= profile_tabs($a,True);
+	require_once 'include/security.php';
+	require_once 'include/conversation.php';
 
-	if(! $update) {
-		$o .= '<h3>' . t('Personal Notes') . '</h3>';
+	$o = Profile::getTabs($a, true);
 
-		$commpage = false;
-		$commvisitor = false;
+	if (!$update) {
+		$o .= '<h3>' . L10n::t('Personal Notes') . '</h3>';
 
-		$x = array(
-			'is_owner' => $is_owner,
+		$x = [
+			'is_owner' => true,
 			'allow_location' => (($a->user['allow_location']) ? true : false),
 			'default_location' => $a->user['default-location'],
 			'nickname' => $a->user['nickname'],
@@ -59,72 +50,42 @@ function notes_content(&$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
-
-	// default permissions - anonymous user
-
-	$sql_extra = " AND `allow_cid` = '<" . $a->contact['id'] . ">' ";
-
-	$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())
-
-	);
+	$condition = ["`uid` = ? AND `type` = 'note' AND `id` = `parent` AND NOT `wall`
+		AND `allow_cid` = ? AND `contact-id` = ?",
+		local_user(), '<' . $a->contact['id'] . '>', $a->contact['id']];
 
-	if (dbm::is_result($r)) {
-		$a->set_pager_total($r[0]['total']);
-		$a->set_pager_itemspage(40);
-	}
+	$notes = dba::count('item', $condition);
 
-	$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'])
+	$a->set_pager_total($notes);
+	$a->set_pager_itemspage(40);
 
-	);
+	$params = ['order' => ['created' => true],
+		'limit' => [$a->pager['start'], $a->pager['itemspage']]];
+	$r = Item::selectForUser(local_user(), ['item_id'], $condition, $params);
 
-	$parents_arr = array();
-	$parents_str = '';
+	if (DBM::is_result($r)) {
+		$parents_arr = [];
 
-	if (dbm::is_result($r)) {
-		foreach($r as $rr)
+		while ($rr = dba::fetch($r)) {
 			$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`");
+		}
+		dba::close($r);
 
-			$o .= conversation($a,$items,'notes',$update);
+		$condition = ['uid' => local_user(), 'parent' => $parents_arr];
+		$result = Item::selectForUser(local_user(), [], $condition);
+		if (DBM::is_result($result)) {
+			$items = conv_sort(dba::inArray($result), 'commented');
+			$o .= conversation($a, $items, 'notes', $update);
 		}
 	}
 
-
 	$o .= paginate($a);
 	return $o;
 }