if ($network === Protocol::DFRN) {
$new_relation = Contact::FOLLOWER;
+
if (($relation == Contact::SHARING) || ($duplex)) {
$new_relation = Contact::FRIEND;
}
logger('dfrn_confirm: request - photos imported');
$new_relation = Contact::SHARING;
+
if (($relation == Contact::FOLLOWER) || ($duplex)) {
$new_relation = Contact::FRIEND;
}
if ($albums) {
$a->data['albums'] = $albums;
+
if ($albums_visible) {
$ret['success'] = true;
}
]);
}
-
if (empty($a->page['aside'])) {
$a->page['aside'] = '';
}
}
}
- if ($contact_id) {
+ if ($contact_id > 0) {
$r = q("SELECT `uid` FROM `contact` WHERE `blocked` = 0 AND `pending` = 0 AND `id` = %d AND `uid` = %d LIMIT 1",
intval($contact_id),
intval($page_owner_uid)
DBA::escape($album),
intval($page_owner_uid)
);
+
if (!DBA::isResult($r)) {
notice(L10n::t('Album not found.') . EOL);
goaway($_SESSION['photo_return']);
'$confirm_name' => 'dropalbum', // Needed so that confirmation will bring us back into this if statement
'$cancel' => L10n::t('Cancel'),
]);
+
$a->error = 1; // Set $a->error so the other module functions don't execute
return;
}
DBA::escape($album)
);
}
+
if (DBA::isResult($r)) {
foreach ($r as $rr) {
$res[] = "'" . DBA::escape($rr['rid']) . "'" ;
// Check if we should do HTML-based delete confirmation
if (!empty($_REQUEST['confirm'])) {
$drop_url = $a->query_string;
+
$a->page['content'] = replace_macros(get_markup_template('confirm.tpl'), [
'$method' => 'post',
'$message' => L10n::t('Do you really want to delete this photo?'),
'$confirm_name' => 'delete', // Needed so that confirmation will bring us back into this if statement
'$cancel' => L10n::t('Cancel'),
]);
+
$a->error = 1; // Set $a->error so the other module functions don't execute
return;
}
DBA::escape($resource_id),
intval($page_owner_uid)
);
+
if (DBA::isResult($p)) {
$ext = $phototypes[$p[0]['type']];
$r = q("UPDATE `photo` SET `desc` = '%s', `album` = '%s', `allow_cid` = '%s', `allow_gid` = '%s', `deny_cid` = '%s', `deny_gid` = '%s' WHERE `resource-id` = '%s' AND `uid` = %d",
if (strpos($tag, '@') === 0) {
$profile = '';
$name = substr($tag,1);
+
if ((strpos($name, '@')) || (strpos($name, 'http://'))) {
$newname = $name;
$links = @Probe::lrdd($name);
+
if (count($links)) {
foreach ($links as $link) {
if ($link['@attributes']['rel'] === 'http://webfinger.net/rel/profile-page') {
$profile = $link['@attributes']['href'];
}
+
if ($link['@attributes']['rel'] === 'salmon') {
$salmon = '$url:' . str_replace(',', '%sc', $link['@attributes']['href']);
+
if (strlen($inform)) {
$inform .= ',';
}
+
$inform .= $salmon;
}
}
}
+
$taginfo[] = [$newname, $profile, $salmon];
} else {
$newname = $name;
$alias = '';
$tagcid = 0;
+
if (strrpos($newname, '+')) {
$tagcid = intval(substr($newname, strrpos($newname, '+') + 1));
}
if (DBA::isResult($r)) {
$newname = $r[0]['name'];
$profile = $r[0]['url'];
+
$notify = 'cid:' . $r[0]['id'];
if (strlen($inform)) {
$inform .= ',';
$inform .= $notify;
}
}
+
if ($profile) {
if (substr($notify, 0, 4) === 'cid:') {
$taginfo[] = [$newname, $profile, $notify, $r[0], '@[url=' . str_replace(',','%2c',$profile) . ']' . $newname . '[/url]'];
} else {
$taginfo[] = [$newname, $profile, $notify, null, $str_tags .= '@[url=' . $profile . ']' . $newname . '[/url]'];
}
+
if (strlen($str_tags)) {
$str_tags .= ',';
}
+
$profile = str_replace(',', '%2c', $profile);
$str_tags .= '@[url='.$profile.']'.$newname.'[/url]';
}
$best = 2;
break;
}
+
if (intval($scales['scale']) == 4) {
$best = 4;
break;
$counter = intval($_REQUEST['counter']);
- $r = q("SELECT COUNT(*) AS `total` FROM `contact` WHERE
- `uid` = %d AND `network` = '%s' AND `rel` IN (%d, %d)",
- intval($uid),
- DBA::escape(Protocol::OSTATUS),
- intval(Contact::FRIEND),
- intval(Contact::SHARING));
-
- if (!$r)
- return($o.L10n::t("Error"));
+ $r = q("SELECT COUNT(*) AS `total` FROM `contact` WHERE
+ `uid` = %d AND `network` = '%s' AND `rel` IN (%d, %d)",
+ intval($uid),
+ DBA::escape(Protocol::OSTATUS),
+ intval(Contact::FRIEND),
+ intval(Contact::SHARING));
+
+ if (!DBA::isResult($r)) {
+ return ($o . L10n::t("Error"));
+ }
$total = $r[0]["total"];
- $r = q("SELECT `url` FROM `contact` WHERE
- `uid` = %d AND `network` = '%s' AND `rel` IN (%d, %d)
+ $r = q("SELECT `url` FROM `contact` WHERE
+ `uid` = %d AND `network` = '%s' AND `rel` IN (%d, %d)
ORDER BY `url`
LIMIT %d, 1",
- intval($uid),
- DBA::escape(Protocol::OSTATUS),
- intval(Contact::FRIEND),
- intval(Contact::SHARING), $counter++);
+ intval($uid),
+ DBA::escape(Protocol::OSTATUS),
+ intval(Contact::FRIEND),
+ intval(Contact::SHARING), $counter++);
- if (!$r) {
+ if (!DBA::isResult($r)) {
$o .= L10n::t("Done");
return $o;
}
DBA::escape(normalise_link($author_link)),
intval($importer['uid'])
);
- if (! DBA::isResult($r)) {
+
+ if (!DBA::isResult($r)) {
logger('Author ' . $author_link . ' unknown to user ' . $importer['uid'] . '.');
- if(PConfig::get($importer['uid'],'system','ostatus_autofriend')) {
+
+ if (PConfig::get($importer['uid'], 'system', 'ostatus_autofriend')) {
$result = Contact::createFromProbe($importer['uid'], $author_link);
- if($result['success']) {
+
+ if ($result['success']) {
$r = q("SELECT * FROM `contact` WHERE `network` = '%s' AND ( `url` = '%s' OR `alias` = '%s')
AND `uid` = %d LIMIT 1",
DBA::escape(Protocol::OSTATUS),
use Friendica\Model\GContact;
use Friendica\Util\Proxy as ProxyUtils;
-function suggest_init(App $a) {
+function suggest_init(App $a)
+{
if (! local_user()) {
return;
}
// perhaps they're visiting - but not a community page, so they wouldn't have write access
if (remote_user() && (!$visitor)) {
$contact_id = 0;
+
if (!empty($_SESSION['remote'])) {
foreach($_SESSION['remote'] as $v) {
if($v['uid'] == $owner_uid) {
$r_json = (x($_GET,'response') && $_GET['response']=='json');
- if($a->argc > 1) {
+ if ($a->argc > 1) {
$nick = $a->argv[1];
$r = q("SELECT `user`.*, `contact`.`id` FROM `user` LEFT JOIN `contact` on `user`.`uid` = `contact`.`uid` WHERE `user`.`nickname` = '%s' AND `user`.`blocked` = 0 and `contact`.`self` = 1 LIMIT 1",
DBA::escape($nick)
);
+
if (! DBA::isResult($r)) {
if ($r_json) {
- echo json_encode(['error'=>L10n::t('Invalid request.')]);
+ echo json_encode(['error' => L10n::t('Invalid request.')]);
killme();
}
return;
- }
-
+ }
} else {
if ($r_json) {
- echo json_encode(['error'=>L10n::t('Invalid request.')]);
+ echo json_encode(['error' => L10n::t('Invalid request.')]);
killme();
}
+
return;
}
$page_owner_nick = $r[0]['nickname'];
$community_page = (($r[0]['page-flags'] == Contact::PAGE_COMMUNITY) ? true : false);
- if((local_user()) && (local_user() == $page_owner_uid))
+ if ((local_user()) && (local_user() == $page_owner_uid)) {
$can_post = true;
- else {
- if($community_page && remote_user()) {
+ } else {
+ if ($community_page && remote_user()) {
$contact_id = 0;
- if(is_array($_SESSION['remote'])) {
- foreach($_SESSION['remote'] as $v) {
- if($v['uid'] == $page_owner_uid) {
+
+ if (is_array($_SESSION['remote'])) {
+ foreach ($_SESSION['remote'] as $v) {
+ if ($v['uid'] == $page_owner_uid) {
$contact_id = $v['cid'];
break;
}
}
}
- if($contact_id) {
+ if ($contact_id > 0) {
$r = q("SELECT `uid` FROM `contact` WHERE `blocked` = 0 AND `pending` = 0 AND `id` = %d AND `uid` = %d LIMIT 1",
intval($contact_id),
intval($page_owner_uid)
);
+
if (DBA::isResult($r)) {
$can_post = true;
$visitor = $contact_id;
}
}
}
- if(! $can_post) {
+
+ if (! $can_post) {
if ($r_json) {
- echo json_encode(['error'=>L10n::t('Permission denied.')]);
+ echo json_encode(['error' => L10n::t('Permission denied.')]);
killme();
}
notice(L10n::t('Permission denied.') . EOL );
killme();
}
- if(! x($_FILES,'userfile')) {
+ if (! x($_FILES,'userfile')) {
if ($r_json) {
- echo json_encode(['error'=>L10n::t('Invalid request.')]);
+ echo json_encode(['error' => L10n::t('Invalid request.')]);
}
killme();
}
* Then Filesize gets <= 0.
*/
- if($filesize <=0) {
+ if ($filesize <= 0) {
$msg = L10n::t('Sorry, maybe your upload is bigger than the PHP configuration allows') . EOL .(L10n::t('Or - did you try to upload an empty file?'));
if ($r_json) {
- echo json_encode(['error'=>$msg]);
+ echo json_encode(['error' => $msg]);
} else {
- notice( $msg. EOL );
+ notice($msg . EOL);
}
@unlink($src);
killme();
}
- if(($maxfilesize) && ($filesize > $maxfilesize)) {
+ if ($maxfilesize && $filesize > $maxfilesize) {
$msg = L10n::t('File exceeds size limit of %s', formatBytes($maxfilesize));
if ($r_json) {
- echo json_encode(['error'=>$msg]);
+ echo json_encode(['error' => $msg]);
} else {
- echo $msg. EOL ;
+ echo $msg . EOL ;
}
@unlink($src);
killme();
@unlink($src);
- if(! $r) {
+ if (! $r) {
$msg = L10n::t('File upload failed.');
if ($r_json) {
- echo json_encode(['error'=>$msg]);
+ echo json_encode(['error' => $msg]);
} else {
- echo $msg. EOL ;
+ echo $msg . EOL ;
}
killme();
}
if (! DBA::isResult($r)) {
$msg = L10n::t('File upload failed.');
if ($r_json) {
- echo json_encode(['error'=>$msg]);
+ echo json_encode(['error' => $msg]);
} else {
- echo $msg. EOL ;
+ echo $msg . EOL ;
}
killme();
}
if ($r_json) {
- echo json_encode(['ok'=>true]);
+ echo json_encode(['ok' => true]);
killme();
}
self::$connection->setAttribute(PDO::ATTR_EMULATE_PREPARES, false);
self::$connected = true;
} catch (PDOException $e) {
+ /// @TODO At least log exception, don't ignore it!
}
}
switch (self::$driver) {
case 'pdo':
return substr(@self::$connection->quote($str, PDO::PARAM_STR), 1, -1);
+
case 'mysqli':
return @self::$connection->real_escape_string($str);
}
switch (self::$driver) {
case 'pdo':
- if (self::$connection->inTransaction()) {
- break;
- }
- if (!self::$connection->beginTransaction()) {
+ if (!self::$connection->inTransaction() && !self::$connection->beginTransaction()) {
return false;
}
break;
+
case 'mysqli':
if (!self::$connection->begin_transaction()) {
return false;
if (!self::$connection->inTransaction()) {
return true;
}
+
return self::$connection->commit();
+
case 'mysqli':
return self::$connection->commit();
}
+
return true;
}
}
$ret = self::$connection->rollBack();
break;
+
case 'mysqli':
$ret = self::$connection->rollback();
break;
$item['guid'] = '';
$item['tag'] = '';
$item['attach'] = '';
+
$slap = OStatus::salmon($item, $owner);
+
if (!empty($contact['notify'])) {
Salmon::slapper($owner, $contact['notify'], $slap);
}
return $result;
}
- public static function updateSslPolicy($contact, $new_policy)
+ /**
+ * @brief Updated contact's SSL policy
+ *
+ * @param array $contact Contact array
+ * @param string $new_policy New policy, valid: self,full
+ *
+ * @return array Contact array with updated values
+ */
+ public static function updateSslPolicy(array $contact, $new_policy)
{
$ssl_changed = false;
if ((intval($new_policy) == SSL_POLICY_SELFSIGN || $new_policy === 'self') && strstr($contact['url'], 'https:')) {
if (isset($arr['parent-uri']) && ($arr['parent-uri'] != $arr['uri'])) {
$conversation['reply-to-uri'] = $arr['parent-uri'];
}
+
if (isset($arr['thr-parent']) && ($arr['thr-parent'] != $arr['uri'])) {
$conversation['reply-to-uri'] = $arr['thr-parent'];
}
intval($uid)
);
+ if (!DBA::isResult($r)) {
+ logger('Cannot find user with uid=' . $uid, LOGGER_INFO);
+ return false;
+ }
+
$location = Profile::formatLocation(
["locality" => $r[0]["locality"], "region" => $r[0]["region"], "country-name" => $r[0]["country-name"]]
);
public static function getOwnerDataByNick($nick)
{
$user = DBA::selectFirst('user', ['uid'], ['nickname' => $nick]);
+
if (!DBA::isResult($user)) {
return false;
}
+
return self::getOwnerDataById($user['uid']);
}
$key = openssl_random_pseudo_bytes(16);
$data = self::aesEncrypt($postvars['data'], $key);
break;
+
default:
logger("rino: invalid requested version '$rino_remote_version'");
Contact::markForArchival($contact);
Contact::updateAvatar($contact_record["photo"], $importer["uid"], $contact_record["id"]);
- // technically they are sharing with us (Contact::SHARING),
- // but if our page-type is PAGE_COMMUNITY or PAGE_SOAPBOX
- // we are going to change the relationship and make them a follower.
-
+ /*
+ * technically they are sharing with us (Contact::SHARING),
+ * but if our page-type is Profile::PAGE_COMMUNITY or Profile::PAGE_SOAPBOX
+ * we are going to change the relationship and make them a follower.
+ */
if (($importer["page-flags"] == Contact::PAGE_FREELOVE) && $sharing && $following) {
$new_relation = Contact::FRIEND;
} elseif (($importer["page-flags"] == Contact::PAGE_FREELOVE) && $sharing) {
*
* @return int The message id of the newly created item
*/
- private static function receiveStatusMessage(array $importer, $data, $xml)
+ private static function receiveStatusMessage(array $importer, SimpleXMLElement $data, $xml)
{
$author = notags(unxmlify($data->author));
$guid = notags(unxmlify($data->guid));
if (($target_item["thr-parent"] != "") && ($target_item["thr-parent"] != $target_item["parent-uri"])) {
$headers .= " <".Email::iri2msgid($target_item["thr-parent"]).">";
}
+
$headers .= "\n";
if (empty($target_item['title'])) {
$condition = ['uri' => $target_item['parent-uri'], 'uid' => $owner['uid']];
$title = Item::selectFirst(['title'], $condition);
+
if (DBA::isResult($title) && ($title['title'] != '')) {
$subject = $title['title'];
} else {
$condition = ['parent-uri' => $target_item['parent-uri'], 'uid' => $owner['uid']];
$title = Item::selectFirst(['title'], $condition);
+
if (DBA::isResult($title) && ($title['title'] != '')) {
$subject = $title['title'];
}
}
}
+
if (strncasecmp($subject, 'RE:', 3)) {
$subject = 'Re: ' . $subject;
}
}
+
Email::send($addr, $subject, $headers, $target_item);
}
}
if (strlen($hub) && $hub_update && (($contact['rel'] != Contact::FOLLOWER) || $contact['network'] == Protocol::FEED)) {
logger('hub ' . $hubmode . ' : ' . $hub . ' contact name : ' . $contact['name'] . ' local user : ' . $importer['name']);
$hubs = explode(',', $hub);
+
if (count($hubs)) {
foreach ($hubs as $h) {
$h = trim($h);
+
if (!strlen($h)) {
continue;
}
+
subscribe_to_hub($h, $importer, $contact, $hubmode);
}
}
* @param array $contact The personal contact entry
* @param array $fields The fields that are updated
*/
- private static function updateContact($contact, $fields)
+ private static function updateContact(array $contact, array $fields)
{
DBA::update('contact', $fields, ['id' => $contact['id']]);
DBA::update('contact', $fields, ['uid' => 0, 'nurl' => $contact['nurl']]);
projects / friendica.git / commitdiff