X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=mod%2Ffsuggest.php;h=2195f455af56605e5ed3288ad74b02029f57c934;hb=236c7718d35fea49282d17fef0640fd612ab7c74;hp=0d088c02c8652abca44cd6788566b7dc9b6d9495;hpb=a59ab5552e21c927d861b2b4ef193a545b956b2c;p=friendica.git

diff --git a/mod/fsuggest.php b/mod/fsuggest.php
index 0d088c02c8..2195f455af 100644
--- a/mod/fsuggest.php
+++ b/mod/fsuggest.php
@@ -2,12 +2,17 @@
 /**
  * @file mod/fsuggest.php
  */
+
 use Friendica\App;
+use Friendica\Core\ACL;
+use Friendica\Core\L10n;
 use Friendica\Core\Worker;
-use Friendica\Database\DBM;
-
-function fsuggest_post(App $a) {
+use Friendica\Database\DBA;
+use Friendica\Util\DateTimeFormat;
+use Friendica\Util\Strings;
 
+function fsuggest_post(App $a)
+{
 	if (! local_user()) {
 		return;
 	}
@@ -22,66 +27,58 @@ function fsuggest_post(App $a) {
 		intval($contact_id),
 		intval(local_user())
 	);
-	if (! DBM::is_result($r)) {
-		notice( t('Contact not found.') . EOL);
+	if (! DBA::isResult($r)) {
+		notice(L10n::t('Contact not found.') . EOL);
 		return;
 	}
 	$contact = $r[0];
 
 	$new_contact = intval($_POST['suggest']);
 
-	$hash = random_string();
+	$hash = Strings::getRandomHex();
 
-	$note = escape_tags(trim($_POST['note']));
+	$note = Strings::escapeHtml(trim(defaults($_POST, 'note', '')));
 
-	if($new_contact) {
+	if ($new_contact) {
 		$r = q("SELECT * FROM `contact` WHERE `id` = %d AND `uid` = %d LIMIT 1",
 			intval($new_contact),
 			intval(local_user())
 		);
-		if (DBM::is_result($r)) {
-
+		if (DBA::isResult($r)) {
 			$x = q("INSERT INTO `fsuggest` ( `uid`,`cid`,`name`,`url`,`request`,`photo`,`note`,`created`)
 				VALUES ( %d, %d, '%s','%s','%s','%s','%s','%s')",
 				intval(local_user()),
 				intval($contact_id),
-				dbesc($r[0]['name']),
-				dbesc($r[0]['url']),
-				dbesc($r[0]['request']),
-				dbesc($r[0]['photo']),
-				dbesc($hash),
-				dbesc(datetime_convert())
+				DBA::escape($r[0]['name']),
+				DBA::escape($r[0]['url']),
+				DBA::escape($r[0]['request']),
+				DBA::escape($r[0]['photo']),
+				DBA::escape($hash),
+				DBA::escape(DateTimeFormat::utcNow())
 			);
 			$r = q("SELECT `id` FROM `fsuggest` WHERE `note` = '%s' AND `uid` = %d LIMIT 1",
-				dbesc($hash),
+				DBA::escape($hash),
 				intval(local_user())
 			);
-			if (DBM::is_result($r)) {
+			if (DBA::isResult($r)) {
 				$fsuggest_id = $r[0]['id'];
 				q("UPDATE `fsuggest` SET `note` = '%s' WHERE `id` = %d AND `uid` = %d",
-					dbesc($note),
+					DBA::escape($note),
 					intval($fsuggest_id),
 					intval(local_user())
 				);
 				Worker::add(PRIORITY_HIGH, 'Notifier', 'suggest', $fsuggest_id);
 			}
 
-			info( t('Friend suggestion sent.') . EOL);
+			info(L10n::t('Friend suggestion sent.') . EOL);
 		}
-
 	}
-
-
 }
 
-
-
 function fsuggest_content(App $a)
 {
-	require_once 'include/acl_selectors.php';
-
 	if (! local_user()) {
-		notice(t('Permission denied.') . EOL);
+		notice(L10n::t('Permission denied.') . EOL);
 		return;
 	}
 
@@ -96,27 +93,26 @@ function fsuggest_content(App $a)
 		intval($contact_id),
 		intval(local_user())
 	);
-	if (! DBM::is_result($r)) {
-		notice(t('Contact not found.') . EOL);
+	if (! DBA::isResult($r)) {
+		notice(L10n::t('Contact not found.') . EOL);
 		return;
 	}
 	$contact = $r[0];
 
-	$o = '<h3>' . t('Suggest Friends') . '</h3>';
+	$o = '<h3>' . L10n::t('Suggest Friends') . '</h3>';
 
-	$o .= '<div id="fsuggest-desc" >' . sprintf(t('Suggest a friend for %s'), $contact['name']) . '</div>';
+	$o .= '<div id="fsuggest-desc" >' . L10n::t('Suggest a friend for %s', $contact['name']) . '</div>';
 
 	$o .= '<form id="fsuggest-form" action="fsuggest/' . $contact_id . '" method="post" >';
 
-	$o .= contact_selector(
+	$o .= ACL::getSuggestContactSelectHTML(
 		'suggest',
 		'suggest-select',
-		array('size' => 4, 'exclude' => $contact_id, 'networks' => 'DFRN_ONLY', 'single' => true),
-		false
+		['size' => 4, 'exclude' => $contact_id, 'networks' => 'DFRN_ONLY', 'single' => true]
 	);
 
 
-	$o .= '<div id="fsuggest-submit-wrapper"><input id="fsuggest-submit" type="submit" name="submit" value="' . t('Submit') . '" /></div>';
+	$o .= '<div id="fsuggest-submit-wrapper"><input id="fsuggest-submit" type="submit" name="submit" value="' . L10n::t('Submit') . '" /></div>';
 	$o .= '</form>';
 
 	return $o;