/**
* @file mod/photos.php
*/
+
use Friendica\App;
use Friendica\Content\Feature;
-use Friendica\Core\System;
+use Friendica\Content\Nav;
+use Friendica\Content\Pager;
+use Friendica\Content\Text\BBCode;
+use Friendica\Core\ACL;
+use Friendica\Core\Addon;
use Friendica\Core\Config;
+use Friendica\Core\L10n;
+use Friendica\Core\Logger;
+use Friendica\Core\Renderer;
+use Friendica\Core\System;
use Friendica\Core\Worker;
-use Friendica\Database\DBM;
+use Friendica\Database\DBA;
+use Friendica\Model\Contact;
+use Friendica\Model\Group;
+use Friendica\Model\Item;
+use Friendica\Model\Photo;
+use Friendica\Model\Profile;
+use Friendica\Model\User;
use Friendica\Network\Probe;
-use Friendica\Object\Contact;
-use Friendica\Object\Photo;
+use Friendica\Object\Image;
+use Friendica\Protocol\DFRN;
+use Friendica\Util\Crypto;
+use Friendica\Util\DateTimeFormat;
+use Friendica\Util\Map;
+use Friendica\Util\Security;
+use Friendica\Util\Temporal;
+use Friendica\Util\Strings;
+use Friendica\Util\XML;
-require_once 'include/photos.php';
require_once 'include/items.php';
-require_once 'include/acl_selectors.php';
-require_once 'include/bbcode.php';
-require_once 'include/security.php';
-require_once 'include/redir.php';
-require_once 'include/tags.php';
-require_once 'include/threads.php';
function photos_init(App $a) {
if ($a->argc > 1) {
- auto_redir($a, $a->argv[1]);
+ DFRN::autoRedir($a, $a->argv[1]);
}
- if ((Config::get('system', 'block_public')) && (! local_user()) && (! remote_user())) {
+ if (Config::get('system', 'block_public') && !local_user() && !remote_user()) {
return;
}
- nav_set_selected('home');
+ Nav::setSelected('home');
if ($a->argc > 1) {
$nick = $a->argv[1];
$user = q("SELECT * FROM `user` WHERE `nickname` = '%s' AND `blocked` = 0 LIMIT 1",
- dbesc($nick)
+ DBA::escape($nick)
);
- if (! DBM::is_result($user)) {
+ if (!DBA::isResult($user)) {
return;
}
$a->profile_uid = $user[0]['uid'];
$is_owner = (local_user() && (local_user() == $a->profile_uid));
- $profile = get_profiledata_by_nick($nick, $a->profile_uid);
+ $profile = Profile::getByNickname($nick, $a->profile_uid);
$account_type = Contact::getAccountType($profile);
- $tpl = get_markup_template("vcard-widget.tpl");
+ $tpl = Renderer::getMarkupTemplate("vcard-widget.tpl");
- $vcard_widget .= replace_macros($tpl, array(
+ $vcard_widget = Renderer::replaceMacros($tpl, [
'$name' => $profile['name'],
'$photo' => $profile['photo'],
- '$addr' => (($profile['addr'] != "") ? $profile['addr'] : ""),
+ '$addr' => defaults($profile, 'addr', ''),
'$account_type' => $account_type,
- '$pdesc' => (($profile['pdesc'] != "") ? $profile['pdesc'] : ""),
- ));
+ '$pdesc' => defaults($profile, 'pdesc', ''),
+ ]);
- $albums = photo_albums($a->data['user']['uid']);
+ $albums = Photo::getAlbums($a->data['user']['uid']);
- $albums_visible = ((intval($a->data['user']['hidewall']) && (! local_user()) && (! remote_user())) ? false : true);
+ $albums_visible = ((intval($a->data['user']['hidewall']) && !local_user() && !remote_user()) ? false : true);
// add various encodings to the array so we can just loop through and pick them out in a template
- $ret = array('success' => false);
+ $ret = ['success' => false];
if ($albums) {
$a->data['albums'] = $albums;
+
if ($albums_visible) {
$ret['success'] = true;
}
- $ret['albums'] = array();
+ $ret['albums'] = [];
foreach ($albums as $k => $album) {
//hide profile photos to others
- if ((! $is_owner) && (! remote_user()) && ($album['album'] == t('Profile Photos')))
+ if (!$is_owner && !remote_user() && ($album['album'] == L10n::t('Profile Photos')))
continue;
- $entry = array(
+ $entry = [
'text' => $album['album'],
'total' => $album['total'],
'url' => 'photos/' . $a->data['user']['nickname'] . '/album/' . bin2hex($album['album']),
'urlencode' => urlencode($album['album']),
'bin2hex' => bin2hex($album['album'])
- );
+ ];
$ret['albums'][] = $entry;
}
}
- $albums = $ret;
-
if (local_user() && $a->data['user']['uid'] == local_user()) {
$can_post = true;
+ } else {
+ $can_post = false;
}
- if ($albums['success']) {
- $photo_albums_widget = replace_macros(get_markup_template('photo_albums.tpl'), array(
+ if ($ret['success']) {
+ $photo_albums_widget = Renderer::replaceMacros(Renderer::getMarkupTemplate('photo_albums.tpl'), [
'$nick' => $a->data['user']['nickname'],
- '$title' => t('Photo Albums'),
- '$recent' => t('Recent Photos'),
- '$albums' => $albums['albums'],
+ '$title' => L10n::t('Photo Albums'),
+ '$recent' => L10n::t('Recent Photos'),
+ '$albums' => $ret['albums'],
'$baseurl' => System::baseUrl(),
- '$upload' => array(t('Upload New Photos'), 'photos/' . $a->data['user']['nickname'] . '/upload'),
+ '$upload' => [L10n::t('Upload New Photos'), 'photos/' . $a->data['user']['nickname'] . '/upload'],
'$can_post' => $can_post
- ));
+ ]);
}
-
- if (! x($a->page, 'aside')) {
+ if (empty($a->page['aside'])) {
$a->page['aside'] = '';
}
+
$a->page['aside'] .= $vcard_widget;
- $a->page['aside'] .= $photo_albums_widget;
+ if (!empty($photo_albums_widget)) {
+ $a->page['aside'] .= $photo_albums_widget;
+ }
- $tpl = get_markup_template("photos_head.tpl");
- $a->page['htmlhead'] .= replace_macros($tpl,array(
- '$ispublic' => t('everybody')
- ));
+ $tpl = Renderer::getMarkupTemplate("photos_head.tpl");
+ $a->page['htmlhead'] .= Renderer::replaceMacros($tpl,[
+ '$ispublic' => L10n::t('everybody')
+ ]);
}
return;
}
+function photos_post(App $a)
+{
+ Logger::log('mod-photos: photos_post: begin' , Logger::DEBUG);
+ Logger::log('mod_photos: REQUEST ' . print_r($_REQUEST, true), Logger::DATA);
+ Logger::log('mod_photos: FILES ' . print_r($_FILES, true), Logger::DATA);
-
-function photos_post(App $a) {
-
- logger('mod-photos: photos_post: begin' , LOGGER_DEBUG);
-
-
- logger('mod_photos: REQUEST ' . print_r($_REQUEST,true), LOGGER_DATA);
- logger('mod_photos: FILES ' . print_r($_FILES,true), LOGGER_DATA);
-
- $phototypes = Photo::supportedTypes();
+ $phototypes = Image::supportedTypes();
$can_post = false;
$visitor = 0;
$page_owner_uid = $a->data['user']['uid'];
- $community_page = (($a->data['user']['page-flags'] == PAGE_COMMUNITY) ? true : false);
+ $community_page = $a->data['user']['page-flags'] == Contact::PAGE_COMMUNITY;
- 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()) {
- $contact_id = 0;
- if (is_array($_SESSION['remote'])) {
- foreach ($_SESSION['remote'] as $v) {
- if ($v['uid'] == $page_owner_uid) {
- $contact_id = $v['cid'];
- break;
- }
+ } elseif ($community_page && remote_user()) {
+ $contact_id = 0;
+
+ if (!empty($_SESSION['remote']) && is_array($_SESSION['remote'])) {
+ foreach ($_SESSION['remote'] as $v) {
+ if ($v['uid'] == $page_owner_uid) {
+ $contact_id = $v['cid'];
+ break;
}
}
- if ($contact_id) {
+ }
- $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 (DBM::is_result($r)) {
- $can_post = true;
- $visitor = $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) {
- notice( t('Permission denied.') . EOL );
+ if (!$can_post) {
+ notice(L10n::t('Permission denied.') . EOL);
killme();
}
- $r = q("SELECT `contact`.*, `user`.`nickname` FROM `contact` LEFT JOIN `user` ON `user`.`uid` = `contact`.`uid`
- WHERE `user`.`uid` = %d AND `self` = 1 LIMIT 1",
- intval($page_owner_uid)
- );
+ $owner_record = User::getOwnerDataById($page_owner_uid);
- if (! DBM::is_result($r)) {
- notice( t('Contact information unavailable') . EOL);
- logger('photos_post: unable to locate contact record for page owner. uid=' . $page_owner_uid);
+ if (!$owner_record) {
+ notice(L10n::t('Contact information unavailable') . EOL);
+ Logger::log('photos_post: unable to locate contact record for page owner. uid=' . $page_owner_uid);
killme();
}
- $owner_record = $r[0];
-
-
- if (($a->argc > 3) && ($a->argv[2] === 'album')) {
+ if ($a->argc > 3 && $a->argv[2] === 'album') {
$album = hex2bin($a->argv[3]);
- if ($album === t('Profile Photos') || $album === 'Contact Photos' || $album === t('Contact Photos')) {
- goaway($_SESSION['photo_return']);
+ if ($album === L10n::t('Profile Photos') || $album === 'Contact Photos' || $album === L10n::t('Contact Photos')) {
+ $a->internalRedirect($_SESSION['photo_return']);
return; // NOTREACHED
}
$r = q("SELECT `album` FROM `photo` WHERE `album` = '%s' AND `uid` = %d",
- dbesc($album),
+ DBA::escape($album),
intval($page_owner_uid)
);
- if (!DBM::is_result($r)) {
- notice( t('Album not found.') . EOL);
- goaway($_SESSION['photo_return']);
+
+ if (!DBA::isResult($r)) {
+ notice(L10n::t('Album not found.') . EOL);
+ $a->internalRedirect($_SESSION['photo_return']);
return; // NOTREACHED
}
// Check if the user has responded to a delete confirmation query
- if ($_REQUEST['canceled']) {
- goaway($_SESSION['photo_return']);
+ if (!empty($_REQUEST['canceled'])) {
+ $a->internalRedirect($_SESSION['photo_return']);
}
- /*
- * RENAME photo album
- */
-
- $newalbum = notags(trim($_POST['albumname']));
+ // RENAME photo album
+ $newalbum = Strings::escapeTags(trim($_POST['albumname']));
if ($newalbum != $album) {
q("UPDATE `photo` SET `album` = '%s' WHERE `album` = '%s' AND `uid` = %d",
- dbesc($newalbum),
- dbesc($album),
+ DBA::escape($newalbum),
+ DBA::escape($album),
intval($page_owner_uid)
);
// Update the photo albums cache
- photo_albums($page_owner_uid, true);
+ Photo::clearAlbumCache($page_owner_uid);
- $newurl = str_replace(bin2hex($album),bin2hex($newalbum),$_SESSION['photo_return']);
- goaway($newurl);
+ $a->internalRedirect('photos/' . $a->user['nickname'] . '/album/' . bin2hex($newalbum));
return; // NOTREACHED
}
* DELETE photo album and all its photos
*/
- if ($_POST['dropalbum'] == t('Delete Album')) {
-
+ if ($_POST['dropalbum'] == L10n::t('Delete Album')) {
// Check if we should do HTML-based delete confirmation
- if ($_REQUEST['confirm']) {
+ if (!empty($_REQUEST['confirm'])) {
$drop_url = $a->query_string;
- $extra_inputs = array(
- array('name' => 'albumname', 'value' => $_POST['albumname']),
- );
- $a->page['content'] = replace_macros(get_markup_template('confirm.tpl'), array(
+
+ $extra_inputs = [
+ ['name' => 'albumname', 'value' => $_POST['albumname']],
+ ];
+
+ $a->page['content'] = Renderer::replaceMacros(Renderer::getMarkupTemplate('confirm.tpl'), [
'$method' => 'post',
- '$message' => t('Do you really want to delete this photo album and all its photos?'),
+ '$message' => L10n::t('Do you really want to delete this photo album and all its photos?'),
'$extra_inputs' => $extra_inputs,
- '$confirm' => t('Delete Album'),
+ '$confirm' => L10n::t('Delete Album'),
'$confirm_url' => $drop_url,
'$confirm_name' => 'dropalbum', // Needed so that confirmation will bring us back into this if statement
- '$cancel' => t('Cancel'),
- ));
+ '$cancel' => L10n::t('Cancel'),
+ ]);
+
$a->error = 1; // Set $a->error so the other module functions don't execute
return;
}
- $res = array();
+ $res = [];
// get the list of photos we are about to delete
$r = q("SELECT distinct(`resource-id`) as `rid` FROM `photo` WHERE `contact-id` = %d AND `uid` = %d AND `album` = '%s'",
intval($visitor),
intval($page_owner_uid),
- dbesc($album)
+ DBA::escape($album)
);
} else {
$r = q("SELECT distinct(`resource-id`) as `rid` FROM `photo` WHERE `uid` = %d AND `album` = '%s'",
intval(local_user()),
- dbesc($album)
+ DBA::escape($album)
);
}
- if (DBM::is_result($r)) {
+
+ if (DBA::isResult($r)) {
foreach ($r as $rr) {
- $res[] = "'" . dbesc($rr['rid']) . "'" ;
+ $res[] = "'" . DBA::escape($rr['rid']) . "'" ;
}
} else {
- goaway($_SESSION['photo_return']);
+ $a->internalRedirect($_SESSION['photo_return']);
return; // NOTREACHED
}
$str_res = implode(',', $res);
// remove the associated photos
-
- q("DELETE FROM `photo` WHERE `resource-id` IN ( $str_res ) AND `uid` = %d",
+ q("DELETE FROM `photo` WHERE `resource-id` IN ($str_res) AND `uid` = %d",
intval($page_owner_uid)
);
// find and delete the corresponding item with all the comments and likes/dislikes
-
- $r = q("SELECT `parent-uri` FROM `item` WHERE `resource-id` IN ( $str_res ) AND `uid` = %d",
- intval($page_owner_uid)
- );
- if (DBM::is_result($r)) {
- foreach ($r as $rr) {
- q("UPDATE `item` SET `deleted` = 1, `changed` = '%s' WHERE `parent-uri` = '%s' AND `uid` = %d",
- dbesc(datetime_convert()),
- dbesc($rr['parent-uri']),
- intval($page_owner_uid)
- );
- create_tags_from_itemuri($rr['parent-uri'], $page_owner_uid);
- delete_thread_uri($rr['parent-uri'], $page_owner_uid);
-
- $drop_id = intval($rr['id']);
-
- // send the notification upstream/downstream as the case may be
-
- if ($rr['visible']) {
- Worker::add(PRIORITY_HIGH, "Notifier", "drop", $drop_id);
- }
- }
- }
+ Item::deleteForUser(['resource-id' => $res, 'uid' => $page_owner_uid], $page_owner_uid);
// Update the photo albums cache
- photo_albums($page_owner_uid, true);
+ Photo::clearAlbumCache($page_owner_uid);
}
- goaway('photos/' . $a->data['user']['nickname']);
+ $a->internalRedirect('photos/' . $a->data['user']['nickname']);
return; // NOTREACHED
}
// Check if the user has responded to a delete confirmation query for a single photo
- if (($a->argc > 2) && $_REQUEST['canceled']) {
- goaway($_SESSION['photo_return']);
+ if ($a->argc > 2 && !empty($_REQUEST['canceled'])) {
+ $a->internalRedirect($_SESSION['photo_return']);
}
- if (($a->argc > 2) && (x($_POST,'delete')) && ($_POST['delete'] == t('Delete Photo'))) {
+ if ($a->argc > 2 && defaults($_POST, 'delete', '') === L10n::t('Delete Photo')) {
// same as above but remove single photo
// Check if we should do HTML-based delete confirmation
- if ($_REQUEST['confirm']) {
+ if (!empty($_REQUEST['confirm'])) {
$drop_url = $a->query_string;
- $a->page['content'] = replace_macros(get_markup_template('confirm.tpl'), array(
+
+ $a->page['content'] = Renderer::replaceMacros(Renderer::getMarkupTemplate('confirm.tpl'), [
'$method' => 'post',
- '$message' => t('Do you really want to delete this photo?'),
- '$extra_inputs' => array(),
- '$confirm' => t('Delete Photo'),
+ '$message' => L10n::t('Do you really want to delete this photo?'),
+ '$extra_inputs' => [],
+ '$confirm' => L10n::t('Delete Photo'),
'$confirm_url' => $drop_url,
'$confirm_name' => 'delete', // Needed so that confirmation will bring us back into this if statement
- '$cancel' => t('Cancel'),
- ));
+ '$cancel' => L10n::t('Cancel'),
+ ]);
+
$a->error = 1; // Set $a->error so the other module functions don't execute
return;
}
$r = q("SELECT `id`, `resource-id` FROM `photo` WHERE `contact-id` = %d AND `uid` = %d AND `resource-id` = '%s' LIMIT 1",
intval($visitor),
intval($page_owner_uid),
- dbesc($a->argv[2])
+ DBA::escape($a->argv[2])
);
} else {
$r = q("SELECT `id`, `resource-id` FROM `photo` WHERE `uid` = %d AND `resource-id` = '%s' LIMIT 1",
intval(local_user()),
- dbesc($a->argv[2])
+ DBA::escape($a->argv[2])
);
}
- if (DBM::is_result($r)) {
+
+ if (DBA::isResult($r)) {
q("DELETE FROM `photo` WHERE `uid` = %d AND `resource-id` = '%s'",
intval($page_owner_uid),
- dbesc($r[0]['resource-id'])
- );
- $i = q("SELECT * FROM `item` WHERE `resource-id` = '%s' AND `uid` = %d LIMIT 1",
- dbesc($r[0]['resource-id']),
- intval($page_owner_uid)
+ DBA::escape($r[0]['resource-id'])
);
- if (DBM::is_result($i)) {
- q("UPDATE `item` SET `deleted` = 1, `edited` = '%s', `changed` = '%s' WHERE `parent-uri` = '%s' AND `uid` = %d",
- dbesc(datetime_convert()),
- dbesc(datetime_convert()),
- dbesc($i[0]['uri']),
- intval($page_owner_uid)
- );
- create_tags_from_itemuri($i[0]['uri'], $page_owner_uid);
- delete_thread_uri($i[0]['uri'], $page_owner_uid);
- $url = System::baseUrl();
- $drop_id = intval($i[0]['id']);
+ Item::deleteForUser(['resource-id' => $r[0]['resource-id'], 'uid' => $page_owner_uid], $page_owner_uid);
- // Update the photo albums cache
- photo_albums($page_owner_uid, true);
-
- if ($i[0]['visible']) {
- Worker::add(PRIORITY_HIGH, "Notifier", "drop", $drop_id);
- }
- }
+ // Update the photo albums cache
+ Photo::clearAlbumCache($page_owner_uid);
}
- goaway('photos/' . $a->data['user']['nickname']);
+ $a->internalRedirect('photos/' . $a->data['user']['nickname']);
return; // NOTREACHED
}
- if (($a->argc > 2) && ((x($_POST,'desc') !== false) || (x($_POST,'newtag') !== false)) || (x($_POST,'albname') !== false)) {
+ if ($a->argc > 2 && (!empty($_POST['desc']) || !empty($_POST['newtag']) || !empty($_POST['albname']) !== false)) {
+ $desc = !empty($_POST['desc']) ? Strings::escapeTags(trim($_POST['desc'])) : '';
+ $rawtags = !empty($_POST['newtag']) ? Strings::escapeTags(trim($_POST['newtag'])) : '';
+ $item_id = !empty($_POST['item_id']) ? intval($_POST['item_id']) : 0;
+ $albname = !empty($_POST['albname']) ? Strings::escapeTags(trim($_POST['albname'])) : '';
+ $origaname = !empty($_POST['origaname']) ? Strings::escapeTags(trim($_POST['origaname'])) : '';
- $desc = ((x($_POST,'desc')) ? notags(trim($_POST['desc'])) : '');
- $rawtags = ((x($_POST,'newtag')) ? notags(trim($_POST['newtag'])) : '');
- $item_id = ((x($_POST,'item_id')) ? intval($_POST['item_id']) : 0);
- $albname = ((x($_POST,'albname')) ? notags(trim($_POST['albname'])) : '');
- $origaname = ((x($_POST,'origaname')) ? notags(trim($_POST['origaname'])) : '');
- $str_group_allow = perms2str($_POST['group_allow']);
- $str_contact_allow = perms2str($_POST['contact_allow']);
- $str_group_deny = perms2str($_POST['group_deny']);
- $str_contact_deny = perms2str($_POST['contact_deny']);
+ $str_group_allow = !empty($_POST['group_allow']) ? perms2str($_POST['group_allow']) : '';
+ $str_contact_allow = !empty($_POST['contact_allow']) ? perms2str($_POST['contact_allow']) : '';
+ $str_group_deny = !empty($_POST['group_deny']) ? perms2str($_POST['group_deny']) : '';
+ $str_contact_deny = !empty($_POST['contact_deny']) ? perms2str($_POST['contact_deny']) : '';
$resource_id = $a->argv[2];
- if (! strlen($albname)) {
- $albname = datetime_convert('UTC',date_default_timezone_get(),'now', 'Y');
+ if (!strlen($albname)) {
+ $albname = DateTimeFormat::localNow('Y');
}
-
- if ((x($_POST,'rotate') !== false) &&
- ( (intval($_POST['rotate']) == 1) || (intval($_POST['rotate']) == 2) )) {
- logger('rotate');
+ if (!empty($_POST['rotate']) && (intval($_POST['rotate']) == 1 || intval($_POST['rotate']) == 2)) {
+ Logger::log('rotate');
$r = q("SELECT * FROM `photo` WHERE `resource-id` = '%s' AND `uid` = %d AND `scale` = 0 LIMIT 1",
- dbesc($resource_id),
+ DBA::escape($resource_id),
intval($page_owner_uid)
);
- if (DBM::is_result($r)) {
- $ph = new Photo($r[0]['data'], $r[0]['type']);
- if ($ph->isValid()) {
- $rotate_deg = ( (intval($_POST['rotate']) == 1) ? 270 : 90 );
- $ph->rotate($rotate_deg);
- $width = $ph->getWidth();
- $height = $ph->getHeight();
+ if (DBA::isResult($r)) {
+ $image = new Image($r[0]['data'], $r[0]['type']);
+
+ if ($image->isValid()) {
+ $rotate_deg = ((intval($_POST['rotate']) == 1) ? 270 : 90);
+ $image->rotate($rotate_deg);
+
+ $width = $image->getWidth();
+ $height = $image->getHeight();
$x = q("UPDATE `photo` SET `data` = '%s', `height` = %d, `width` = %d WHERE `resource-id` = '%s' AND `uid` = %d AND `scale` = 0",
- dbesc($ph->imageString()),
+ DBA::escape($image->asString()),
intval($height),
intval($width),
- dbesc($resource_id),
+ DBA::escape($resource_id),
intval($page_owner_uid)
);
if ($width > 640 || $height > 640) {
- $ph->scaleImage(640);
- $width = $ph->getWidth();
- $height = $ph->getHeight();
+ $image->scaleDown(640);
+ $width = $image->getWidth();
+ $height = $image->getHeight();
$x = q("UPDATE `photo` SET `data` = '%s', `height` = %d, `width` = %d WHERE `resource-id` = '%s' AND `uid` = %d AND `scale` = 1",
- dbesc($ph->imageString()),
+ DBA::escape($image->asString()),
intval($height),
intval($width),
- dbesc($resource_id),
+ DBA::escape($resource_id),
intval($page_owner_uid)
);
}
if ($width > 320 || $height > 320) {
- $ph->scaleImage(320);
- $width = $ph->getWidth();
- $height = $ph->getHeight();
+ $image->scaleDown(320);
+ $width = $image->getWidth();
+ $height = $image->getHeight();
$x = q("UPDATE `photo` SET `data` = '%s', `height` = %d, `width` = %d WHERE `resource-id` = '%s' AND `uid` = %d AND `scale` = 2",
- dbesc($ph->imageString()),
+ DBA::escape($image->asString()),
intval($height),
intval($width),
- dbesc($resource_id),
+ DBA::escape($resource_id),
intval($page_owner_uid)
);
}
}
$p = q("SELECT * FROM `photo` WHERE `resource-id` = '%s' AND `uid` = %d ORDER BY `scale` DESC",
- dbesc($resource_id),
+ DBA::escape($resource_id),
intval($page_owner_uid)
);
- if (DBM::is_result($p)) {
+
+ 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",
- dbesc($desc),
- dbesc($albname),
- dbesc($str_contact_allow),
- dbesc($str_group_allow),
- dbesc($str_contact_deny),
- dbesc($str_group_deny),
- dbesc($resource_id),
+ DBA::escape($desc),
+ DBA::escape($albname),
+ DBA::escape($str_contact_allow),
+ DBA::escape($str_group_allow),
+ DBA::escape($str_contact_deny),
+ DBA::escape($str_group_deny),
+ DBA::escape($resource_id),
intval($page_owner_uid)
);
// Update the photo albums cache if album name was changed
if ($albname !== $origaname) {
- photo_albums($page_owner_uid, true);
+ Photo::clearAlbumCache($page_owner_uid);
}
}
$visibility = 1;
}
- if (! $item_id) {
-
+ if (!$item_id) {
// Create item container
-
$title = '';
- $uri = item_new_uri($a->get_hostname(),$page_owner_uid);
+ $uri = Item::newURI($page_owner_uid);
- $arr = array();
- $arr['guid'] = get_guid(32);
+ $arr = [];
+ $arr['guid'] = System::createUUID();
$arr['uid'] = $page_owner_uid;
$arr['uri'] = $uri;
$arr['parent-uri'] = $uri;
- $arr['type'] = 'photo';
+ $arr['post-type'] = Item::PT_IMAGE;
$arr['wall'] = 1;
$arr['resource-id'] = $p[0]['resource-id'];
$arr['contact-id'] = $owner_record['id'];
$arr['allow_gid'] = $p[0]['allow_gid'];
$arr['deny_cid'] = $p[0]['deny_cid'];
$arr['deny_gid'] = $p[0]['deny_gid'];
- $arr['last-child'] = 1;
$arr['visible'] = $visibility;
$arr['origin'] = 1;
. '[img]' . System::baseUrl() . '/photo/' . $p[0]['resource-id'] . '-' . $p[0]['scale'] . '.'. $ext . '[/img]'
. '[/url]';
- $item_id = item_store($arr);
-
+ $item_id = Item::insert($arr);
}
if ($item_id) {
- $r = q("SELECT * FROM `item` WHERE `id` = %d AND `uid` = %d LIMIT 1",
- intval($item_id),
- intval($page_owner_uid)
- );
+ $item = Item::selectFirst(['tag', 'inform'], ['id' => $item_id, 'uid' => $page_owner_uid]);
}
- if (DBM::is_result($r)) {
- $old_tag = $r[0]['tag'];
- $old_inform = $r[0]['inform'];
+ if (DBA::isResult($item)) {
+ $old_tag = $item['tag'];
+ $old_inform = $item['inform'];
}
if (strlen($rawtags)) {
-
$str_tags = '';
$inform = '';
// if the new tag doesn't have a namespace specifier (@foo or #foo) give it a hashtag
-
- $x = substr($rawtags,0,1);
+ $x = substr($rawtags, 0, 1);
if ($x !== '@' && $x !== '#') {
$rawtags = '#' . $rawtags;
}
- $taginfo = array();
- $tags = get_tags($rawtags);
+ $taginfo = [];
+ $tags = BBCode::getTags($rawtags);
if (count($tags)) {
foreach ($tags as $tag) {
- if (isset($profile)) {
- unset($profile);
- }
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[] = array($newname, $profile, $salmon);
+
+ $taginfo[] = [$newname, $profile, $salmon];
} else {
$newname = $name;
$alias = '';
$tagcid = 0;
+
if (strrpos($newname, '+')) {
$tagcid = intval(substr($newname, strrpos($newname, '+') + 1));
}
//select someone from this user's contacts by name
$r = q("SELECT * FROM `contact` WHERE `name` = '%s' AND `uid` = %d LIMIT 1",
- dbesc($newname),
+ DBA::escape($newname),
intval($page_owner_uid)
);
- if (! DBM::is_result($r)) {
+ if (!DBA::isResult($r)) {
//select someone by attag or nick and the name passed in
$r = q("SELECT * FROM `contact` WHERE `attag` = '%s' OR `nick` = '%s' AND `uid` = %d ORDER BY `attag` DESC LIMIT 1",
- dbesc($name),
- dbesc($name),
+ DBA::escape($name),
+ DBA::escape($name),
intval($page_owner_uid)
);
}
}
- if (DBM::is_result($r)) {
+ 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[] = array($newname, $profile, $notify, $r[0], '@[url=' . str_replace(',','%2c',$profile) . ']' . $newname . '[/url]');
+ $taginfo[] = [$newname, $profile, $notify, $r[0], '@[url=' . str_replace(',','%2c',$profile) . ']' . $newname . '[/url]'];
} else {
- $taginfo[] = array($newname, $profile, $notify, null, $str_tags .= '@[url=' . $profile . ']' . $newname . '[/url]');
+ $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]';
+ $str_tags .= '@[url=' . $profile . ']' . $newname . '[/url]';
}
} elseif (strpos($tag, '#') === 0) {
$tagname = substr($tag, 1);
- $str_tags .= '#[url=' . System::baseUrl() . "/search?tag=" . $tagname . ']' . $tagname . '[/url]';
+ $str_tags .= '#[url=' . System::baseUrl() . "/search?tag=" . $tagname . ']' . $tagname . '[/url],';
}
}
}
}
$newinform .= $inform;
- $r = q("UPDATE `item` SET `tag` = '%s', `inform` = '%s', `edited` = '%s', `changed` = '%s' WHERE `id` = %d AND `uid` = %d",
- dbesc($newtag),
- dbesc($newinform),
- dbesc(datetime_convert()),
- dbesc(datetime_convert()),
- intval($item_id),
- intval($page_owner_uid)
- );
- create_tags_from_item($item_id);
- update_thread($item_id);
+ $fields = ['tag' => $newtag, 'inform' => $newinform, 'edited' => DateTimeFormat::utcNow(), 'changed' => DateTimeFormat::utcNow()];
+ $condition = ['id' => $item_id];
+ Item::update($fields, $condition);
$best = 0;
foreach ($p as $scales) {
$best = 2;
break;
}
+
if (intval($scales['scale']) == 4) {
$best = 4;
break;
if (count($taginfo)) {
foreach ($taginfo as $tagged) {
+ $uri = Item::newURI($page_owner_uid);
- $uri = item_new_uri($a->get_hostname(),$page_owner_uid);
-
- $arr = array();
- $arr['guid'] = get_guid(32);
+ $arr = [];
+ $arr['guid'] = System::createUUID();
$arr['uid'] = $page_owner_uid;
$arr['uri'] = $uri;
$arr['parent-uri'] = $uri;
- $arr['type'] = 'activity';
$arr['wall'] = 1;
$arr['contact-id'] = $owner_record['id'];
$arr['owner-name'] = $owner_record['name'];
$arr['allow_gid'] = $p[0]['allow_gid'];
$arr['deny_cid'] = $p[0]['deny_cid'];
$arr['deny_gid'] = $p[0]['deny_gid'];
- $arr['last-child'] = 1;
$arr['visible'] = 1;
$arr['verb'] = ACTIVITY_TAG;
+ $arr['gravity'] = GRAVITY_PARENT;
$arr['object-type'] = ACTIVITY_OBJ_PERSON;
$arr['target-type'] = ACTIVITY_OBJ_IMAGE;
$arr['tag'] = $tagged[4];
$arr['inform'] = $tagged[2];
$arr['origin'] = 1;
- $arr['body'] = sprintf( t('%1$s was tagged in %2$s by %3$s'), '[url=' . $tagged[1] . ']' . $tagged[0] . '[/url]', '[url=' . System::baseUrl() . '/photos/' . $owner_record['nickname'] . '/image/' . $p[0]['resource-id'] . ']' . t('a photo') . '[/url]', '[url=' . $owner_record['url'] . ']' . $owner_record['name'] . '[/url]') ;
+ $arr['body'] = L10n::t('%1$s was tagged in %2$s by %3$s', '[url=' . $tagged[1] . ']' . $tagged[0] . '[/url]', '[url=' . System::baseUrl() . '/photos/' . $owner_record['nickname'] . '/image/' . $p[0]['resource-id'] . ']' . L10n::t('a photo') . '[/url]', '[url=' . $owner_record['url'] . ']' . $owner_record['name'] . '[/url]') ;
$arr['body'] .= "\n\n" . '[url=' . System::baseUrl() . '/photos/' . $owner_record['nickname'] . '/image/' . $p[0]['resource-id'] . ']' . '[img]' . System::baseUrl() . "/photo/" . $p[0]['resource-id'] . '-' . $best . '.' . $ext . '[/img][/url]' . "\n" ;
$arr['object'] = '<object><type>' . ACTIVITY_OBJ_PERSON . '</type><title>' . $tagged[0] . '</title><id>' . $tagged[1] . '/' . $tagged[0] . '</id>';
- $arr['object'] .= '<link>' . xmlify('<link rel="alternate" type="text/html" href="' . $tagged[1] . '" />' . "\n");
+ $arr['object'] .= '<link>' . XML::escape('<link rel="alternate" type="text/html" href="' . $tagged[1] . '" />' . "\n");
if ($tagged[3]) {
- $arr['object'] .= xmlify('<link rel="photo" type="'.$p[0]['type'].'" href="' . $tagged[3]['photo'] . '" />' . "\n");
+ $arr['object'] .= XML::escape('<link rel="photo" type="'.$p[0]['type'].'" href="' . $tagged[3]['photo'] . '" />' . "\n");
}
$arr['object'] .= '</link></object>' . "\n";
$arr['target'] = '<target><type>' . ACTIVITY_OBJ_IMAGE . '</type><title>' . $p[0]['desc'] . '</title><id>'
. System::baseUrl() . '/photos/' . $owner_record['nickname'] . '/image/' . $p[0]['resource-id'] . '</id>';
- $arr['target'] .= '<link>' . xmlify('<link rel="alternate" type="text/html" href="' . System::baseUrl() . '/photos/' . $owner_record['nickname'] . '/image/' . $p[0]['resource-id'] . '" />' . "\n" . '<link rel="preview" type="'.$p[0]['type'].'" href="' . System::baseUrl() . "/photo/" . $p[0]['resource-id'] . '-' . $best . '.' . $ext . '" />') . '</link></target>';
+ $arr['target'] .= '<link>' . XML::escape('<link rel="alternate" type="text/html" href="' . System::baseUrl() . '/photos/' . $owner_record['nickname'] . '/image/' . $p[0]['resource-id'] . '" />' . "\n" . '<link rel="preview" type="'.$p[0]['type'].'" href="' . System::baseUrl() . "/photo/" . $p[0]['resource-id'] . '-' . $best . '.' . $ext . '" />') . '</link></target>';
- $item_id = item_store($arr);
- if ($item_id) {
- Worker::add(PRIORITY_HIGH, "Notifier", "tag", $item_id);
- }
+ $item_id = Item::insert($arr);
}
}
}
- goaway($_SESSION['photo_return']);
+ $a->internalRedirect($_SESSION['photo_return']);
return; // NOTREACHED
}
- /**
- * default post action - upload a photo
- */
+ // default post action - upload a photo
+ Addon::callHooks('photo_post_init', $_POST);
- call_hooks('photo_post_init', $_POST);
+ // Determine the album to use
+ $album = !empty($_REQUEST['album']) ? Strings::escapeTags(trim($_REQUEST['album'])) : '';
+ $newalbum = !empty($_REQUEST['newalbum']) ? Strings::escapeTags(trim($_REQUEST['newalbum'])) : '';
- /**
- * Determine the album to use
- */
-
- $album = notags(trim($_REQUEST['album']));
- $newalbum = notags(trim($_REQUEST['newalbum']));
-
- logger('mod/photos.php: photos_post(): album= ' . $album . ' newalbum= ' . $newalbum , LOGGER_DEBUG);
+ Logger::log('mod/photos.php: photos_post(): album= ' . $album . ' newalbum= ' . $newalbum , Logger::DEBUG);
- if (! strlen($album)) {
+ if (!strlen($album)) {
if (strlen($newalbum)) {
$album = $newalbum;
} else {
- $album = datetime_convert('UTC',date_default_timezone_get(),'now', 'Y');
+ $album = DateTimeFormat::localNow('Y');
}
}
*/
$r = q("SELECT * FROM `photo` WHERE `album` = '%s' AND `uid` = %d AND `created` > UTC_TIMESTAMP() - INTERVAL 3 HOUR ",
- dbesc($album),
+ DBA::escape($album),
intval($page_owner_uid)
);
- if ((! DBM::is_result($r)) || ($album == t('Profile Photos'))) {
+
+ if (!DBA::isResult($r) || ($album == L10n::t('Profile Photos'))) {
$visible = 1;
} else {
$visible = 0;
}
- if (intval($_REQUEST['not_visible']) || $_REQUEST['not_visible'] === 'true') {
+ if (!empty($_REQUEST['not_visible']) && $_REQUEST['not_visible'] !== 'false') {
$visible = 0;
}
- $str_group_allow = perms2str(((is_array($_REQUEST['group_allow'])) ? $_REQUEST['group_allow'] : explode(',', $_REQUEST['group_allow'])));
- $str_contact_allow = perms2str(((is_array($_REQUEST['contact_allow'])) ? $_REQUEST['contact_allow'] : explode(',', $_REQUEST['contact_allow'])));
- $str_group_deny = perms2str(((is_array($_REQUEST['group_deny'])) ? $_REQUEST['group_deny'] : explode(',', $_REQUEST['group_deny'])));
- $str_contact_deny = perms2str(((is_array($_REQUEST['contact_deny'])) ? $_REQUEST['contact_deny'] : explode(',', $_REQUEST['contact_deny'])));
+ $group_allow = defaults($_REQUEST, 'group_allow' , []);
+ $contact_allow = defaults($_REQUEST, 'contact_allow', []);
+ $group_deny = defaults($_REQUEST, 'group_deny' , []);
+ $contact_deny = defaults($_REQUEST, 'contact_deny' , []);
+
+ $str_group_allow = perms2str(is_array($group_allow) ? $group_allow : explode(',', $group_allow));
+ $str_contact_allow = perms2str(is_array($contact_allow) ? $contact_allow : explode(',', $contact_allow));
+ $str_group_deny = perms2str(is_array($group_deny) ? $group_deny : explode(',', $group_deny));
+ $str_contact_deny = perms2str(is_array($contact_deny) ? $contact_deny : explode(',', $contact_deny));
- $ret = array('src' => '', 'filename' => '', 'filesize' => 0, 'type' => '');
+ $ret = ['src' => '', 'filename' => '', 'filesize' => 0, 'type' => ''];
- call_hooks('photo_post_file',$ret);
+ Addon::callHooks('photo_post_file', $ret);
- if (x($ret,'src') && x($ret,'filesize')) {
+ if (!empty($ret['src']) && !empty($ret['filesize'])) {
$src = $ret['src'];
$filename = $ret['filename'];
$filesize = $ret['filesize'];
$type = $ret['type'];
+ $error = UPLOAD_ERR_OK;
+ } elseif (!empty($_FILES['userfile'])) {
+ $src = $_FILES['userfile']['tmp_name'];
+ $filename = basename($_FILES['userfile']['name']);
+ $filesize = intval($_FILES['userfile']['size']);
+ $type = $_FILES['userfile']['type'];
+ $error = $_FILES['userfile']['error'];
} else {
- $src = $_FILES['userfile']['tmp_name'];
- $filename = basename($_FILES['userfile']['name']);
- $filesize = intval($_FILES['userfile']['size']);
- $type = $_FILES['userfile']['type'];
+ $error = UPLOAD_ERR_NO_FILE;
}
+
+ if ($error !== UPLOAD_ERR_OK) {
+ switch ($error) {
+ case UPLOAD_ERR_INI_SIZE:
+ notice(L10n::t('Image exceeds size limit of %s', ini_get('upload_max_filesize')) . EOL);
+ break;
+ case UPLOAD_ERR_FORM_SIZE:
+ notice(L10n::t('Image exceeds size limit of %s', Strings::formatBytes(defaults($_REQUEST, 'MAX_FILE_SIZE', 0))) . EOL);
+ break;
+ case UPLOAD_ERR_PARTIAL:
+ notice(L10n::t('Image upload didn\'t complete, please try again') . EOL);
+ break;
+ case UPLOAD_ERR_NO_FILE:
+ notice(L10n::t('Image file is missing') . EOL);
+ break;
+ case UPLOAD_ERR_NO_TMP_DIR:
+ case UPLOAD_ERR_CANT_WRITE:
+ case UPLOAD_ERR_EXTENSION:
+ notice(L10n::t('Server can\'t accept new file upload at this time, please contact your administrator') . EOL);
+ break;
+ }
+ @unlink($src);
+ $foo = 0;
+ Addon::callHooks('photo_post_end', $foo);
+ return;
+ }
+
if ($type == "") {
- $type = Photo::guessImageType($filename);
+ $type = Image::guessType($filename);
}
- logger('photos: upload: received file: ' . $filename . ' as ' . $src . ' ('. $type . ') ' . $filesize . ' bytes', LOGGER_DEBUG);
+ Logger::log('photos: upload: received file: ' . $filename . ' as ' . $src . ' ('. $type . ') ' . $filesize . ' bytes', Logger::DEBUG);
- $maximagesize = Config::get('system','maximagesize');
+ $maximagesize = Config::get('system', 'maximagesize');
- if (($maximagesize) && ($filesize > $maximagesize)) {
- notice( sprintf(t('Image exceeds size limit of %s'), formatBytes($maximagesize)) . EOL);
+ if ($maximagesize && ($filesize > $maximagesize)) {
+ notice(L10n::t('Image exceeds size limit of %s', Strings::formatBytes($maximagesize)) . EOL);
@unlink($src);
$foo = 0;
- call_hooks('photo_post_end',$foo);
+ Addon::callHooks('photo_post_end', $foo);
return;
}
- if (! $filesize) {
- notice( t('Image file is empty.') . EOL);
+ if (!$filesize) {
+ notice(L10n::t('Image file is empty.') . EOL);
@unlink($src);
$foo = 0;
- call_hooks('photo_post_end',$foo);
+ Addon::callHooks('photo_post_end', $foo);
return;
}
- logger('mod/photos.php: photos_post(): loading the contents of ' . $src , LOGGER_DEBUG);
+ Logger::log('mod/photos.php: photos_post(): loading the contents of ' . $src , Logger::DEBUG);
$imagedata = @file_get_contents($src);
- $ph = new Photo($imagedata, $type);
+ $image = new Image($imagedata, $type);
- if (! $ph->isValid()) {
- logger('mod/photos.php: photos_post(): unable to process image' , LOGGER_DEBUG);
- notice( t('Unable to process image.') . EOL );
+ if (!$image->isValid()) {
+ Logger::log('mod/photos.php: photos_post(): unable to process image' , Logger::DEBUG);
+ notice(L10n::t('Unable to process image.') . EOL);
@unlink($src);
$foo = 0;
- call_hooks('photo_post_end',$foo);
+ Addon::callHooks('photo_post_end',$foo);
killme();
}
- $exif = $ph->orient($src);
+ $exif = $image->orient($src);
@unlink($src);
$max_length = Config::get('system', 'max_image_length');
- if (! $max_length) {
+ if (!$max_length) {
$max_length = MAX_IMAGE_LENGTH;
}
if ($max_length > 0) {
- $ph->scaleImage($max_length);
+ $image->scaleDown($max_length);
}
- $width = $ph->getWidth();
- $height = $ph->getHeight();
+ $width = $image->getWidth();
+ $height = $image->getHeight();
$smallest = 0;
- $photo_hash = photo_new_resource();
+ $photo_hash = Photo::newResource();
- $r = $ph->store($page_owner_uid, $visitor, $photo_hash, $filename, $album, 0 , 0, $str_contact_allow, $str_group_allow, $str_contact_deny, $str_group_deny);
+ $r = Photo::store($image, $page_owner_uid, $visitor, $photo_hash, $filename, $album, 0 , 0, $str_contact_allow, $str_group_allow, $str_contact_deny, $str_group_deny);
- if (! $r) {
- logger('mod/photos.php: photos_post(): image store failed' , LOGGER_DEBUG);
- notice( t('Image upload failed.') . EOL );
+ if (!$r) {
+ Logger::log('mod/photos.php: photos_post(): image store failed', Logger::DEBUG);
+ notice(L10n::t('Image upload failed.') . EOL);
killme();
}
if ($width > 640 || $height > 640) {
- $ph->scaleImage(640);
- $ph->store($page_owner_uid, $visitor, $photo_hash, $filename, $album, 1, 0, $str_contact_allow, $str_group_allow, $str_contact_deny, $str_group_deny);
+ $image->scaleDown(640);
+ Photo::store($image, $page_owner_uid, $visitor, $photo_hash, $filename, $album, 1, 0, $str_contact_allow, $str_group_allow, $str_contact_deny, $str_group_deny);
$smallest = 1;
}
if ($width > 320 || $height > 320) {
- $ph->scaleImage(320);
- $ph->store($page_owner_uid, $visitor, $photo_hash, $filename, $album, 2, 0, $str_contact_allow, $str_group_allow, $str_contact_deny, $str_group_deny);
+ $image->scaleDown(320);
+ Photo::store($image, $page_owner_uid, $visitor, $photo_hash, $filename, $album, 2, 0, $str_contact_allow, $str_group_allow, $str_contact_deny, $str_group_deny);
$smallest = 2;
}
- $basename = basename($filename);
- $uri = item_new_uri($a->get_hostname(), $page_owner_uid);
+ $uri = Item::newURI($page_owner_uid);
// Create item container
-
$lat = $lon = null;
-
- /// @TODO merge these 2 if() into one?
- if ($exif && $exif['GPS']) {
- if (Feature::isEnabled($channel_id,'photo_location')) {
- $lat = getGps($exif['GPS']['GPSLatitude'], $exif['GPS']['GPSLatitudeRef']);
- $lon = getGps($exif['GPS']['GPSLongitude'], $exif['GPS']['GPSLongitudeRef']);
- }
+ if ($exif && $exif['GPS'] && Feature::isEnabled($page_owner_uid, 'photo_location')) {
+ $lat = Photo::getGps($exif['GPS']['GPSLatitude'], $exif['GPS']['GPSLatitudeRef']);
+ $lon = Photo::getGps($exif['GPS']['GPSLongitude'], $exif['GPS']['GPSLongitudeRef']);
}
- $arr = array();
-
+ $arr = [];
if ($lat && $lon) {
$arr['coord'] = $lat . ' ' . $lon;
}
- $arr['guid'] = get_guid(32);
+ $arr['guid'] = System::createUUID();
$arr['uid'] = $page_owner_uid;
$arr['uri'] = $uri;
$arr['parent-uri'] = $uri;
$arr['allow_gid'] = $str_group_allow;
$arr['deny_cid'] = $str_contact_deny;
$arr['deny_gid'] = $str_group_deny;
- $arr['last-child'] = 1;
$arr['visible'] = $visible;
$arr['origin'] = 1;
$arr['body'] = '[url=' . System::baseUrl() . '/photos/' . $owner_record['nickname'] . '/image/' . $photo_hash . ']'
- . '[img]' . System::baseUrl() . "/photo/{$photo_hash}-{$smallest}.".$ph->getExt() . '[/img]'
+ . '[img]' . System::baseUrl() . "/photo/{$photo_hash}-{$smallest}.".$image->getExt() . '[/img]'
. '[/url]';
- $item_id = item_store($arr);
+ $item_id = Item::insert($arr);
// Update the photo albums cache
- photo_albums($page_owner_uid, true);
+ Photo::clearAlbumCache($page_owner_uid);
- if ($visible) {
- Worker::add(PRIORITY_HIGH, "Notifier", 'wall-new', $item_id);
- }
+ Addon::callHooks('photo_post_end', $item_id);
- call_hooks('photo_post_end',intval($item_id));
-
- /*
- * addon uploaders should call "killme()" [e.g. exit] within the photo_post_end hook
- * if they do not wish to be redirected
- */
+ // addon uploaders should call "killme()" [e.g. exit] within the photo_post_end hook
+ // if they do not wish to be redirected
- goaway($_SESSION['photo_return']);
+ $a->internalRedirect($_SESSION['photo_return']);
// NOTREACHED
}
-function photos_content(App $a) {
-
+function photos_content(App $a)
+{
// URLs:
// photos/name
// photos/name/upload
// photos/name/image/xxxxx
// photos/name/image/xxxxx/edit
-
- if ((Config::get('system', 'block_public')) && (! local_user()) && (! remote_user())) {
- notice( t('Public access denied.') . EOL);
+ if (Config::get('system', 'block_public') && !local_user() && !remote_user()) {
+ notice(L10n::t('Public access denied.') . EOL);
return;
}
- require_once 'include/bbcode.php';
- require_once 'include/security.php';
require_once 'include/conversation.php';
- if (! x($a->data,'user')) {
- notice( t('No photos selected') . EOL );
+ if (empty($a->data['user'])) {
+ notice(L10n::t('No photos selected') . EOL);
return;
}
- $phototypes = Photo::supportedTypes();
+ $phototypes = Image::supportedTypes();
$_SESSION['photo_return'] = $a->cmd;
- //
// Parse arguments
- //
-
+ $datum = null;
if ($a->argc > 3) {
$datatype = $a->argv[2];
$datum = $a->argv[3];
$cmd = 'view';
}
- //
// Setup permissions structures
- //
-
$can_post = false;
$visitor = 0;
$contact = null;
$remote_contact = false;
$contact_id = 0;
+ $edit = false;
$owner_uid = $a->data['user']['uid'];
- $community_page = (($a->data['user']['page-flags'] == PAGE_COMMUNITY) ? true : false);
+ $community_page = (($a->data['user']['page-flags'] == Contact::PAGE_COMMUNITY) ? true : false);
- if ((local_user()) && (local_user() == $owner_uid)) {
+ if (local_user() && (local_user() == $owner_uid)) {
$can_post = true;
} else {
if ($community_page && remote_user()) {
intval($contact_id),
intval($owner_uid)
);
- if (DBM::is_result($r)) {
+ if (DBA::isResult($r)) {
$can_post = true;
$contact = $r[0];
$remote_contact = true;
}
}
- // perhaps they're visiting - but not a community page, so they wouldn't have write access
+ $groups = [];
- if (remote_user() && (! $visitor)) {
+ // perhaps they're visiting - but not a community page, so they wouldn't have write access
+ if (remote_user() && !$visitor) {
$contact_id = 0;
if (is_array($_SESSION['remote'])) {
foreach ($_SESSION['remote'] as $v) {
}
}
if ($contact_id) {
- $groups = init_groups_visitor($contact_id);
+ $groups = Group::getIdsByContactId($contact_id);
$r = q("SELECT * FROM `contact` WHERE `blocked` = 0 AND `pending` = 0 AND `id` = %d AND `uid` = %d LIMIT 1",
intval($contact_id),
intval($owner_uid)
);
- if (DBM::is_result($r)) {
+ if (DBA::isResult($r)) {
$contact = $r[0];
$remote_contact = true;
}
}
}
- /// @TODO merge these 2 if() into one?
- if (! $remote_contact) {
- if (local_user()) {
- $contact_id = $_SESSION['cid'];
- $contact = $a->contact;
- }
+ if (!$remote_contact && local_user()) {
+ $contact_id = $_SESSION['cid'];
+ $contact = $a->contact;
}
- if ($a->data['user']['hidewall'] && (local_user() != $owner_uid) && (! $remote_contact)) {
- notice( t('Access to this item is restricted.') . EOL);
+ if ($a->data['user']['hidewall'] && (local_user() != $owner_uid) && !$remote_contact) {
+ notice(L10n::t('Access to this item is restricted.') . EOL);
return;
}
- $sql_extra = permissions_sql($owner_uid,$remote_contact,$groups);
+ $sql_extra = Security::getPermissionsSQLByUserId($owner_uid, $remote_contact, $groups);
$o = "";
// tabs
$is_owner = (local_user() && (local_user() == $owner_uid));
- $o .= profile_tabs($a, $is_owner, $a->data['user']['nickname']);
-
- /**
- * Display upload form
- */
+ $o .= Profile::getTabs($a, $is_owner, $a->data['user']['nickname']);
+ // Display upload form
if ($datatype === 'upload') {
- if (! ($can_post)) {
- notice(t('Permission denied.'));
+ if (!$can_post) {
+ notice(L10n::t('Permission denied.'));
return;
}
-
- $selname = (($datum) ? hex2bin($datum) : '');
-
+ $selname = $datum ? hex2bin($datum) : '';
$albumselect = '';
-
- $albumselect .= '<option value="" ' . ((! $selname) ? ' selected="selected" ' : '') . '> </option>';
- if (count($a->data['albums'])) {
+ $albumselect .= '<option value="" ' . (!$selname ? ' selected="selected" ' : '') . '><current year></option>';
+ if (!empty($a->data['albums'])) {
foreach ($a->data['albums'] as $album) {
- if (($album['album'] === '') || ($album['album'] === 'Contact Photos') || ($album['album'] === t('Contact Photos'))) {
+ if (($album['album'] === '') || ($album['album'] === 'Contact Photos') || ($album['album'] === L10n::t('Contact Photos'))) {
continue;
}
$selected = (($selname === $album['album']) ? ' selected="selected" ' : '');
$uploader = '';
- $ret = array('post_url' => 'photos/' . $a->data['user']['nickname'],
+ $ret = ['post_url' => 'photos/' . $a->data['user']['nickname'],
'addon_text' => $uploader,
- 'default_upload' => true);
+ 'default_upload' => true];
- call_hooks('photo_upload_form',$ret);
+ Addon::callHooks('photo_upload_form',$ret);
- $default_upload_box = replace_macros(get_markup_template('photos_default_uploader_box.tpl'), array());
- $default_upload_submit = replace_macros(get_markup_template('photos_default_uploader_submit.tpl'), array(
- '$submit' => t('Submit'),
- ));
+ $default_upload_box = Renderer::replaceMacros(Renderer::getMarkupTemplate('photos_default_uploader_box.tpl'), []);
+ $default_upload_submit = Renderer::replaceMacros(Renderer::getMarkupTemplate('photos_default_uploader_submit.tpl'), [
+ '$submit' => L10n::t('Submit'),
+ ]);
$usage_message = '';
- // Private/public post links for the non-JS ACL form
- $private_post = 1;
- if ($_REQUEST['public']) {
- $private_post = 0;
- }
+ $tpl = Renderer::getMarkupTemplate('photos_upload.tpl');
- $query_str = $a->query_string;
- if (strpos($query_str, 'public=1') !== false) {
- $query_str = str_replace(array('?public=1', '&public=1'), array('', ''), $query_str);
- }
+ $aclselect_e = ($visitor ? '' : ACL::getFullSelectorHTML($a->user));
- /*
- * I think $a->query_string may never have ? in it, but I could be wrong
- * It looks like it's from the index.php?q=[etc] rewrite that the web
- * server does, which converts any ? to &, e.g. suggest&ignore=61 for suggest?ignore=61
- */
- if (strpos($query_str, '?') === false) {
- $public_post_link = '?public=1';
- } else {
- $public_post_link = '&public=1';
- }
-
- $tpl = get_markup_template('photos_upload.tpl');
-
- $albumselect_e = $albumselect;
- $aclselect_e = (($visitor) ? '' : populate_acl($a->user));
-
- $o .= replace_macros($tpl,array(
- '$pagename' => t('Upload Photos'),
+ $o .= Renderer::replaceMacros($tpl,[
+ '$pagename' => L10n::t('Upload Photos'),
'$sessid' => session_id(),
'$usage' => $usage_message,
'$nickname' => $a->data['user']['nickname'],
- '$newalbum' => t('New album name: '),
- '$existalbumtext' => t('or existing album name: '),
- '$nosharetext' => t('Do not show a status post for this upload'),
- '$albumselect' => $albumselect_e,
- '$permissions' => t('Permissions'),
+ '$newalbum' => L10n::t('New album name: '),
+ '$existalbumtext' => L10n::t('or select existing album:'),
+ '$nosharetext' => L10n::t('Do not show a status post for this upload'),
+ '$albumselect' => $albumselect,
+ '$permissions' => L10n::t('Permissions'),
'$aclselect' => $aclselect_e,
+ '$lockstate' => is_array($a->user)
+ && (strlen($a->user['allow_cid'])
+ || strlen($a->user['allow_gid'])
+ || strlen($a->user['deny_cid'])
+ || strlen($a->user['deny_gid'])
+ ) ? 'lock' : 'unlock',
'$alt_uploader' => $ret['addon_text'],
- '$default_upload_box' => (($ret['default_upload']) ? $default_upload_box : ''),
- '$default_upload_submit' => (($ret['default_upload']) ? $default_upload_submit : ''),
+ '$default_upload_box' => ($ret['default_upload'] ? $default_upload_box : ''),
+ '$default_upload_submit' => ($ret['default_upload'] ? $default_upload_submit : ''),
'$uploadurl' => $ret['post_url'],
// ACL permissions box
- '$acl_data' => construct_acl_data($a, $a->user), // For non-Javascript ACL selector
- '$group_perms' => t('Show to Groups'),
- '$contact_perms' => t('Show to Contacts'),
- '$private' => t('Private Photo'),
- '$public' => t('Public Photo'),
- '$is_private' => $private_post,
- '$return_path' => $query_str,
- '$public_link' => $public_post_link,
-
- ));
+ '$group_perms' => L10n::t('Show to Groups'),
+ '$contact_perms' => L10n::t('Show to Contacts'),
+ '$return_path' => $a->query_string,
+ ]);
return $o;
}
- /*
- * Display a single photo album
- */
-
+ // Display a single photo album
if ($datatype === 'album') {
-
$album = hex2bin($datum);
+ $total = 0;
$r = q("SELECT `resource-id`, max(`scale`) AS `scale` FROM `photo` WHERE `uid` = %d AND `album` = '%s'
AND `scale` <= 4 $sql_extra GROUP BY `resource-id`",
intval($owner_uid),
- dbesc($album)
+ DBA::escape($album)
);
- if (DBM::is_result($r)) {
- $a->set_pager_total(count($r));
- $a->set_pager_itemspage(20);
+ if (DBA::isResult($r)) {
+ $total = count($r);
}
+ $pager = new Pager($a->query_string, 20);
+
/// @TODO I have seen this many times, maybe generalize it script-wide and encapsulate it?
- if ($_GET['order'] === 'posted') {
+ $order_field = defaults($_GET, 'order', '');
+ if ($order_field === 'posted') {
$order = 'ASC';
} else {
$order = 'DESC';
FROM `photo` WHERE `uid` = %d AND `album` = '%s'
AND `scale` <= 4 $sql_extra GROUP BY `resource-id` ORDER BY `created` $order LIMIT %d , %d",
intval($owner_uid),
- dbesc($album),
- intval($a->pager['start']),
- intval($a->pager['itemspage'])
+ DBA::escape($album),
+ $pager->getStart(),
+ $pager->getItemsPerPage()
);
// edit album name
if ($cmd === 'edit') {
- if (($album !== t('Profile Photos')) && ($album !== 'Contact Photos') && ($album !== t('Contact Photos'))) {
+ if (($album !== L10n::t('Profile Photos')) && ($album !== 'Contact Photos') && ($album !== L10n::t('Contact Photos'))) {
if ($can_post) {
- $edit_tpl = get_markup_template('album_edit.tpl');
+ $edit_tpl = Renderer::getMarkupTemplate('album_edit.tpl');
$album_e = $album;
- $o .= replace_macros($edit_tpl,array(
- '$nametext' => t('New album name: '),
+ $o .= Renderer::replaceMacros($edit_tpl,[
+ '$nametext' => L10n::t('New album name: '),
'$nickname' => $a->data['user']['nickname'],
'$album' => $album_e,
'$hexalbum' => bin2hex($album),
- '$submit' => t('Submit'),
- '$dropsubmit' => t('Delete Album')
- ));
+ '$submit' => L10n::t('Submit'),
+ '$dropsubmit' => L10n::t('Delete Album')
+ ]);
}
}
} else {
- if (($album !== t('Profile Photos')) && ($album !== 'Contact Photos') && ($album !== t('Contact Photos')) && $can_post) {
- $edit = array(t('Edit Album'), 'photos/' . $a->data['user']['nickname'] . '/album/' . bin2hex($album) . '/edit');
+ if (($album !== L10n::t('Profile Photos')) && ($album !== 'Contact Photos') && ($album !== L10n::t('Contact Photos')) && $can_post) {
+ $edit = [L10n::t('Edit Album'), 'photos/' . $a->data['user']['nickname'] . '/album/' . bin2hex($album) . '/edit'];
}
}
- if ($_GET['order'] === 'posted') {
- $order = array(t('Show Newest First'), 'photos/' . $a->data['user']['nickname'] . '/album/' . bin2hex($album));
+ if ($order_field === 'posted') {
+ $order = [L10n::t('Show Newest First'), 'photos/' . $a->data['user']['nickname'] . '/album/' . bin2hex($album), 'oldest'];
} else {
- $order = array(t('Show Oldest First'), 'photos/' . $a->data['user']['nickname'] . '/album/' . bin2hex($album) . '?f=&order=posted');
+ $order = [L10n::t('Show Oldest First'), 'photos/' . $a->data['user']['nickname'] . '/album/' . bin2hex($album) . '?f=&order=posted', 'newest'];
}
- $photos = array();
+ $photos = [];
- if (DBM::is_result($r))
- $twist = 'rotright';
+ if (DBA::isResult($r)) {
+ // "Twist" is only used for the duepunto theme with style "slackr"
+ $twist = false;
foreach ($r as $rr) {
- if ($twist == 'rotright') {
- $twist = 'rotleft';
- } else {
- $twist = 'rotright';
- }
+ $twist = !$twist;
$ext = $phototypes[$rr['type']];
$imgalt_e = $rr['filename'];
$desc_e = $rr['desc'];
- $photos[] = array(
+ $photos[] = [
'id' => $rr['id'],
- 'twist' => ' ' . $twist . rand(2,4),
+ 'twist' => ' ' . ($twist ? 'rotleft' : 'rotright') . rand(2,4),
'link' => 'photos/' . $a->data['user']['nickname'] . '/image/' . $rr['resource-id']
- . (($_GET['order'] === 'posted') ? '?f=&order=posted' : ''),
- 'title' => t('View Photo'),
+ . ($order_field === 'posted' ? '?f=&order=posted' : ''),
+ 'title' => L10n::t('View Photo'),
'src' => 'photo/' . $rr['resource-id'] . '-' . $rr['scale'] . '.' .$ext,
'alt' => $imgalt_e,
'desc'=> $desc_e,
'ext' => $ext,
- 'hash'=> $rr['resource_id'],
- );
+ 'hash'=> $rr['resource-id'],
+ ];
+ }
}
- $tpl = get_markup_template('photo_album.tpl');
- $o .= replace_macros($tpl, array(
- '$photos' => $photos,
- '$album' => $album,
- '$can_post' => $can_post,
- '$upload' => array(t('Upload New Photos'), 'photos/' . $a->data['user']['nickname'] . '/upload/' . bin2hex($album)),
- '$order' => $order,
- '$edit' => $edit,
- '$paginate' => paginate($a),
- ));
+ $tpl = Renderer::getMarkupTemplate('photo_album.tpl');
+ $o .= Renderer::replaceMacros($tpl, [
+ '$photos' => $photos,
+ '$album' => $album,
+ '$can_post' => $can_post,
+ '$upload' => [L10n::t('Upload New Photos'), 'photos/' . $a->data['user']['nickname'] . '/upload/' . bin2hex($album)],
+ '$order' => $order,
+ '$edit' => $edit,
+ '$paginate' => $pager->renderFull($total),
+ ]);
return $o;
}
- /*
- * Display one photo
- */
+ // Display one photo
if ($datatype === 'image') {
-
- //$o = '';
// fetch image, item containing image, then comments
-
$ph = q("SELECT * FROM `photo` WHERE `uid` = %d AND `resource-id` = '%s'
$sql_extra ORDER BY `scale` ASC ",
intval($owner_uid),
- dbesc($datum)
+ DBA::escape($datum)
);
- if (! DBM::is_result($ph)) {
+ if (!DBA::isResult($ph)) {
$ph = q("SELECT `id` FROM `photo` WHERE `uid` = %d AND `resource-id` = '%s'
LIMIT 1",
intval($owner_uid),
- dbesc($datum)
+ DBA::escape($datum)
);
- if (DBM::is_result($ph)) {
- notice(t('Permission denied. Access to this item may be restricted.'));
+ if (DBA::isResult($ph)) {
+ notice(L10n::t('Permission denied. Access to this item may be restricted.'));
} else {
- notice(t('Photo not available') . EOL );
+ notice(L10n::t('Photo not available') . EOL);
}
return;
}
$prevlink = '';
$nextlink = '';
- /// @todo This query is totally bad, the whole functionality has to be changed
- // The query leads to a really intense used index.
- // By now we hide it if someone wants to.
+ /*
+ * @todo This query is totally bad, the whole functionality has to be changed
+ * The query leads to a really intense used index.
+ * By now we hide it if someone wants to.
+ */
if (!Config::get('system', 'no_count', false)) {
- if ($_GET['order'] === 'posted')
+ $order_field = defaults($_GET, 'order', '');
+
+ if ($order_field === 'posted') {
$order = 'ASC';
- else
+ } else {
$order = 'DESC';
+ }
$prvnxt = q("SELECT `resource-id` FROM `photo` WHERE `album` = '%s' AND `uid` = %d AND `scale` = 0
$sql_extra ORDER BY `created` $order ",
- dbesc($ph[0]['album']),
+ DBA::escape($ph[0]['album']),
intval($owner_uid)
);
- if (DBM::is_result($prvnxt)) {
+ if (DBA::isResult($prvnxt)) {
+ $prv = null;
+ $nxt = null;
foreach ($prvnxt as $z => $entry) {
if ($entry['resource-id'] == $ph[0]['resource-id']) {
$prv = $z - 1;
break;
}
}
- $edit_suffix = ((($cmd === 'edit') && ($can_post)) ? '/edit' : '');
- $prevlink = 'photos/' . $a->data['user']['nickname'] . '/image/' . $prvnxt[$prv]['resource-id'] . $edit_suffix . (($_GET['order'] === 'posted') ? '?f=&order=posted' : '');
- $nextlink = 'photos/' . $a->data['user']['nickname'] . '/image/' . $prvnxt[$nxt]['resource-id'] . $edit_suffix . (($_GET['order'] === 'posted') ? '?f=&order=posted' : '');
+ $edit_suffix = ((($cmd === 'edit') && $can_post) ? '/edit' : '');
+ if (!is_null($prv)) {
+ $prevlink = 'photos/' . $a->data['user']['nickname'] . '/image/' . $prvnxt[$prv]['resource-id'] . $edit_suffix . ($order_field === 'posted' ? '?f=&order=posted' : '');
+ }
+ if (!is_null($nxt)) {
+ $nextlink = 'photos/' . $a->data['user']['nickname'] . '/image/' . $prvnxt[$nxt]['resource-id'] . $edit_suffix . ($order_field === 'posted' ? '?f=&order=posted' : '');
+ }
}
}
- if (count($ph) == 1)
+ if (count($ph) == 1) {
$hires = $lores = $ph[0];
+ }
+
if (count($ph) > 1) {
if ($ph[1]['scale'] == 2) {
// original is 640 or less, we can display it directly
}
$album_link = 'photos/' . $a->data['user']['nickname'] . '/album/' . bin2hex($ph[0]['album']);
+
$tools = null;
$lock = null;
if ($can_post && ($ph[0]['uid'] == $owner_uid)) {
- $tools = array(
- 'edit' => array('photos/' . $a->data['user']['nickname'] . '/image/' . $datum . (($cmd === 'edit') ? '' : '/edit'), (($cmd === 'edit') ? t('View photo') : t('Edit photo'))),
- 'profile'=>array('profile_photo/use/'.$ph[0]['resource-id'], t('Use as profile photo')),
- );
+ $tools = [
+ 'edit' => ['photos/' . $a->data['user']['nickname'] . '/image/' . $datum . (($cmd === 'edit') ? '' : '/edit'), (($cmd === 'edit') ? L10n::t('View photo') : L10n::t('Edit photo'))],
+ 'profile'=>['profile_photo/use/'.$ph[0]['resource-id'], L10n::t('Use as profile photo')],
+ ];
// lock
- $lock = ( ( ($ph[0]['uid'] == local_user()) && (strlen($ph[0]['allow_cid']) || strlen($ph[0]['allow_gid'])
- || strlen($ph[0]['deny_cid']) || strlen($ph[0]['deny_gid'])) )
- ? t('Private Message')
+ $lock = ((($ph[0]['uid'] == local_user()) && (strlen($ph[0]['allow_cid']) || strlen($ph[0]['allow_gid'])
+ || strlen($ph[0]['deny_cid']) || strlen($ph[0]['deny_gid'])))
+ ? L10n::t('Private Message')
: Null);
}
- if ( $cmd === 'edit') {
- $tpl = get_markup_template('photo_edit_head.tpl');
- $a->page['htmlhead'] .= replace_macros($tpl,array(
+ if ($cmd === 'edit') {
+ $tpl = Renderer::getMarkupTemplate('photo_edit_head.tpl');
+ $a->page['htmlhead'] .= Renderer::replaceMacros($tpl,[
'$prevlink' => $prevlink,
'$nextlink' => $nextlink
- ));
+ ]);
}
- if ($prevlink)
- $prevlink = array($prevlink, '<div class="icon prev"></div>') ;
+ if ($prevlink) {
+ $prevlink = [$prevlink, '<div class="icon prev"></div>'] ;
+ }
- $photo = array(
+ $photo = [
'href' => 'photo/' . $hires['resource-id'] . '-' . $hires['scale'] . '.' . $phototypes[$hires['type']],
- 'title'=> t('View Full Size'),
- 'src' => 'photo/' . $lores['resource-id'] . '-' . $lores['scale'] . '.' . $phototypes[$lores['type']] . '?f=&_u=' . datetime_convert('','','','ymdhis'),
+ 'title'=> L10n::t('View Full Size'),
+ 'src' => 'photo/' . $lores['resource-id'] . '-' . $lores['scale'] . '.' . $phototypes[$lores['type']] . '?f=&_u=' . DateTimeFormat::utcNow('ymdhis'),
'height' => $hires['height'],
'width' => $hires['width'],
'album' => $hires['album'],
'filename' => $hires['filename'],
- );
+ ];
if ($nextlink) {
- $nextlink = array($nextlink, '<div class="icon next"></div>');
+ $nextlink = [$nextlink, '<div class="icon next"></div>'];
}
// The difference is that we won't be displaying the conversation head item
// as a "post" but displaying instead the photo it is linked to
- $linked_items = q("SELECT * FROM `item` WHERE `resource-id` = '%s' $sql_extra LIMIT 1",
- dbesc($datum)
+ /// @todo Rewrite this query. To do so, $sql_extra must be changed
+ $linked_items = q("SELECT `id` FROM `item` WHERE `resource-id` = '%s' $sql_extra LIMIT 1",
+ DBA::escape($datum)
);
$map = null;
+ $link_item = [];
+ $total = 0;
- if (DBM::is_result($linked_items)) {
- $link_item = $linked_items[0];
-
- $r = q("SELECT COUNT(*) AS `total`
- FROM `item` LEFT JOIN `contact` ON `contact`.`id` = `item`.`contact-id`
- WHERE `parent-uri` = '%s' AND `uri` != '%s' AND `item`.`deleted` = 0 and `item`.`moderated` = 0
- AND `contact`.`blocked` = 0 AND `contact`.`pending` = 0
- AND `item`.`uid` = %d
- $sql_extra ",
- dbesc($link_item['uri']),
- dbesc($link_item['uri']),
- intval($link_item['uid'])
+ if (DBA::isResult($linked_items)) {
+ // This is a workaround to not being forced to rewrite the while $sql_extra handling
+ $link_item = Item::selectFirst([], ['id' => $linked_items[0]['id']]);
- );
+ $condition = ["`parent` = ? AND `parent` != `id`", $link_item['parent']];
+ $total = DBA::count('item', $condition);
- if (DBM::is_result($r)) {
- $a->set_pager_total($r[0]['total']);
- }
+ $pager = new Pager($a->query_string);
+ $params = ['order' => ['id'], 'limit' => [$pager->getStart(), $pager->getItemsPerPage()]];
+ $result = Item::selectForUser($link_item['uid'], Item::ITEM_FIELDLIST, $condition, $params);
+ $items = Item::inArray($result);
- $r = q("SELECT `item`.*, `item`.`id` AS `item_id`,
- `contact`.`name`, `contact`.`photo`, `contact`.`url`, `contact`.`network`,
- `contact`.`rel`, `contact`.`thumb`, `contact`.`self`,
- `contact`.`id` AS `cid`, `contact`.`uid` AS `contact-uid`
- FROM `item` LEFT JOIN `contact` ON `contact`.`id` = `item`.`contact-id`
- WHERE `parent-uri` = '%s' AND `uri` != '%s' AND `item`.`deleted` = 0 and `item`.`moderated` = 0
- AND `contact`.`blocked` = 0 AND `contact`.`pending` = 0
- AND `item`.`uid` = %d
- $sql_extra
- ORDER BY `parent` DESC, `id` ASC LIMIT %d ,%d ",
- dbesc($link_item['uri']),
- dbesc($link_item['uri']),
- intval($link_item['uid']),
- intval($a->pager['start']),
- intval($a->pager['itemspage'])
-
- );
-
- if ((local_user()) && (local_user() == $link_item['uid'])) {
- q("UPDATE `item` SET `unseen` = 0 WHERE `parent` = %d and `uid` = %d",
- intval($link_item['parent']),
- intval(local_user())
- );
- update_thread($link_item['parent']);
+ if (local_user() && (local_user() == $link_item['uid'])) {
+ Item::update(['unseen' => false], ['parent' => $link_item['parent']]);
}
if ($link_item['coord']) {
- $map = generate_map($link_item['coord']);
+ $map = Map::byCoordinates($link_item['coord']);
}
}
if (count($linked_items) && strlen($link_item['tag'])) {
$arr = explode(',', $link_item['tag']);
// parse tags and add links
- $tag_str = '';
- foreach ($arr as $t) {
- if (strlen($tag_str)) {
- $tag_str .= ', ';
- }
- $tag_str .= bbcode($t);
+ $tag_arr = [];
+ foreach ($arr as $tag) {
+ $tag_arr[] = [
+ 'name' => BBCode::convert($tag),
+ 'removeurl' => '/tagrm/'.$link_item['id'] . '/' . bin2hex($tag)
+ ];
}
- $tags = array(t('Tags: '), $tag_str);
+ $tags = ['title' => L10n::t('Tags: '), 'tags' => $tag_arr];
if ($cmd === 'edit') {
- $tags[] = 'tagrm/' . $link_item['id'];
- $tags[] = t('[Remove any tag]');
+ $tags['removeanyurl'] = 'tagrm/' . $link_item['id'];
+ $tags['removetitle'] = L10n::t('[Select tags to remove]');
}
}
$edit = Null;
- if (($cmd === 'edit') && ($can_post)) {
- $edit_tpl = get_markup_template('photo_edit.tpl');
-
- // Private/public post links for the non-JS ACL form
- $private_post = 1;
- if ($_REQUEST['public']) {
- $private_post = 0;
- }
-
- $query_str = $a->query_string;
- if (strpos($query_str, 'public=1') !== false) {
- $query_str = str_replace(array('?public=1', '&public=1'), array('', ''), $query_str);
- }
-
- /*
- * I think $a->query_string may never have ? in it, but I could be wrong
- * It looks like it's from the index.php?q=[etc] rewrite that the web
- * server does, which converts any ? to &, e.g. suggest&ignore=61 for suggest?ignore=61
- */
- if (strpos($query_str, '?') === false) {
- $public_post_link = '?public=1';
- } else {
- $public_post_link = '&public=1';
- }
+ if ($cmd === 'edit' && $can_post) {
+ $edit_tpl = Renderer::getMarkupTemplate('photo_edit.tpl');
$album_e = $ph[0]['album'];
$caption_e = $ph[0]['desc'];
- $aclselect_e = populate_acl($ph[0]);
+ $aclselect_e = ACL::getFullSelectorHTML($a->user, false, $ph[0]);
- $edit = replace_macros($edit_tpl, array(
+ $edit = Renderer::replaceMacros($edit_tpl, [
'$id' => $ph[0]['id'],
- '$album' => array('albname', t('New album name'), $album_e,''),
- '$caption' => array('desc', t('Caption'), $caption_e, ''),
- '$tags' => array('newtag', t('Add a Tag'), "", t('Example: @bob, @Barbara_Jensen, @jim@example.com, #California, #camping')),
- '$rotate_none' => array('rotate', t('Do not rotate'),0,'', true),
- '$rotate_cw' => array('rotate', t('Rotate CW (right)'),1,''),
- '$rotate_ccw' => array('rotate', t('Rotate CCW (left)'),2,''),
+ '$album' => ['albname', L10n::t('New album name'), $album_e,''],
+ '$caption' => ['desc', L10n::t('Caption'), $caption_e, ''],
+ '$tags' => ['newtag', L10n::t('Add a Tag'), "", L10n::t('Example: @bob, @Barbara_Jensen, @jim@example.com, #California, #camping')],
+ '$rotate_none' => ['rotate', L10n::t('Do not rotate'),0,'', true],
+ '$rotate_cw' => ['rotate', L10n::t("Rotate CW \x28right\x29"),1,''],
+ '$rotate_ccw' => ['rotate', L10n::t("Rotate CCW \x28left\x29"),2,''],
'$nickname' => $a->data['user']['nickname'],
'$resource_id' => $ph[0]['resource-id'],
- '$permissions' => t('Permissions'),
+ '$permissions' => L10n::t('Permissions'),
'$aclselect' => $aclselect_e,
- '$item_id' => ((count($linked_items)) ? $link_item['id'] : 0),
- '$submit' => t('Submit'),
- '$delete' => t('Delete Photo'),
+ '$item_id' => defaults($link_item, 'id', 0),
+ '$submit' => L10n::t('Submit'),
+ '$delete' => L10n::t('Delete Photo'),
// ACL permissions box
- '$acl_data' => construct_acl_data($a, $ph[0]), // For non-Javascript ACL selector
- '$group_perms' => t('Show to Groups'),
- '$contact_perms' => t('Show to Contacts'),
- '$private' => t('Private photo'),
- '$public' => t('Public photo'),
- '$is_private' => $private_post,
- '$return_path' => $query_str,
- '$public_link' => $public_post_link,
- ));
+ '$group_perms' => L10n::t('Show to Groups'),
+ '$contact_perms' => L10n::t('Show to Contacts'),
+ '$return_path' => $a->query_string,
+ ]);
}
- if (count($linked_items)) {
-
- $cmnt_tpl = get_markup_template('comment_item.tpl');
- $tpl = get_markup_template('photo_item.tpl');
- $return_url = $a->cmd;
+ $like = '';
+ $dislike = '';
+ $likebuttons = '';
+ $comments = '';
+ $paginate = '';
+ $responses = '';
- $like_tpl = get_markup_template('like_noshare.tpl');
-
- $likebuttons = '';
+ if (count($linked_items)) {
+ $cmnt_tpl = Renderer::getMarkupTemplate('comment_item.tpl');
+ $tpl = Renderer::getMarkupTemplate('photo_item.tpl');
+ $return_path = $a->cmd;
- if ($can_post || can_write_wall($a, $owner_uid)) {
- $likebuttons = replace_macros($like_tpl, array(
+ if ($can_post || Security::canWriteToUserWall($owner_uid)) {
+ $like_tpl = Renderer::getMarkupTemplate('like_noshare.tpl');
+ $likebuttons = Renderer::replaceMacros($like_tpl, [
'$id' => $link_item['id'],
- '$likethis' => t("I like this \x28toggle\x29"),
- '$nolike' => (Feature::isEnabled(local_user(), 'dislike') ? t("I don't like this \x28toggle\x29") : ''),
- '$wait' => t('Please wait'),
+ '$likethis' => L10n::t("I like this \x28toggle\x29"),
+ '$nolike' => L10n::t("I don't like this \x28toggle\x29"),
+ '$wait' => L10n::t('Please wait'),
'$return_path' => $a->query_string,
- ));
+ ]);
}
- $comments = '';
- if (! DBM::is_result($r)) {
- if (($can_post || can_write_wall($a, $owner_uid)) && $link_item['last-child']) {
- $comments .= replace_macros($cmnt_tpl, array(
+ if (!DBA::isResult($items)) {
+ if (($can_post || Security::canWriteToUserWall($owner_uid))) {
+ $comments .= Renderer::replaceMacros($cmnt_tpl, [
'$return_path' => '',
- '$jsreload' => $return_url,
- '$type' => 'wall-comment',
+ '$jsreload' => $return_path,
'$id' => $link_item['id'],
'$parent' => $link_item['id'],
'$profile_uid' => $owner_uid,
'$mylink' => $contact['url'],
- '$mytitle' => t('This is you'),
+ '$mytitle' => L10n::t('This is you'),
'$myphoto' => $contact['thumb'],
- '$comment' => t('Comment'),
- '$submit' => t('Submit'),
- '$preview' => t('Preview'),
- '$sourceapp' => t($a->sourcename),
+ '$comment' => L10n::t('Comment'),
+ '$submit' => L10n::t('Submit'),
+ '$preview' => L10n::t('Preview'),
+ '$sourceapp' => L10n::t($a->sourcename),
'$ww' => '',
- '$rand_num' => random_digits(12)
- ));
+ '$rand_num' => Crypto::randomDigits(12)
+ ]);
}
}
- $alike = array();
- $dlike = array();
-
- $like = '';
- $dislike = '';
-
- $conv_responses = array(
- 'like' => array('title' => t('Likes','title')),'dislike' => array('title' => t('Dislikes','title')),
- 'attendyes' => array('title' => t('Attending','title')), 'attendno' => array('title' => t('Not attending','title')), 'attendmaybe' => array('title' => t('Might attend','title'))
- );
+ $conv_responses = [
+ 'like' => ['title' => L10n::t('Likes','title')],'dislike' => ['title' => L10n::t('Dislikes','title')],
+ 'attendyes' => ['title' => L10n::t('Attending','title')], 'attendno' => ['title' => L10n::t('Not attending','title')], 'attendmaybe' => ['title' => L10n::t('Might attend','title')]
+ ];
// display comments
- if (DBM::is_result($r)) {
-
- foreach ($r as $item) {
+ if (DBA::isResult($items)) {
+ foreach ($items as $item) {
builtin_activity_puller($item, $conv_responses);
}
- $like = ((x($conv_responses['like'], $link_item['uri'])) ? format_like($conv_responses['like'][$link_item['uri']], $conv_responses['like'][$link_item['uri'] . '-l'], 'like',$link_item['id']) : '');
- $dislike = ((x($conv_responses['dislike'], $link_item['uri'])) ? format_like($conv_responses['dislike'][$link_item['uri']], $conv_responses['dislike'][$link_item['uri'] . '-l'], 'dislike',$link_item['id']) : '');
+ if (!empty($conv_responses['like'][$link_item['uri']])) {
+ $like = format_like($conv_responses['like'][$link_item['uri']], $conv_responses['like'][$link_item['uri'] . '-l'], 'like', $link_item['id']);
+ }
- if (($can_post || can_write_wall($a, $owner_uid)) && $link_item['last-child']) {
- $comments .= replace_macros($cmnt_tpl,array(
+ if (!empty($conv_responses['dislike'][$link_item['uri']])) {
+ $dislike = format_like($conv_responses['dislike'][$link_item['uri']], $conv_responses['dislike'][$link_item['uri'] . '-l'], 'dislike', $link_item['id']);
+ }
+
+ if (($can_post || Security::canWriteToUserWall($owner_uid))) {
+ $comments .= Renderer::replaceMacros($cmnt_tpl,[
'$return_path' => '',
- '$jsreload' => $return_url,
- '$type' => 'wall-comment',
+ '$jsreload' => $return_path,
'$id' => $link_item['id'],
'$parent' => $link_item['id'],
'$profile_uid' => $owner_uid,
'$mylink' => $contact['url'],
- '$mytitle' => t('This is you'),
+ '$mytitle' => L10n::t('This is you'),
'$myphoto' => $contact['thumb'],
- '$comment' => t('Comment'),
- '$submit' => t('Submit'),
- '$preview' => t('Preview'),
- '$sourceapp' => t($a->sourcename),
+ '$comment' => L10n::t('Comment'),
+ '$submit' => L10n::t('Submit'),
+ '$preview' => L10n::t('Preview'),
+ '$sourceapp' => L10n::t($a->sourcename),
'$ww' => '',
- '$rand_num' => random_digits(12)
- ));
+ '$rand_num' => Crypto::randomDigits(12)
+ ]);
}
-
- foreach ($r as $item) {
+ foreach ($items as $item) {
$comment = '';
$template = $tpl;
$sparkle = '';
- if (((activity_match($item['verb'],ACTIVITY_LIKE)) || (activity_match($item['verb'],ACTIVITY_DISLIKE))) && ($item['id'] != $item['parent']))
+ if ((activity_match($item['verb'], ACTIVITY_LIKE) || activity_match($item['verb'], ACTIVITY_DISLIKE)) && ($item['id'] != $item['parent'])) {
continue;
+ }
- $redirect_url = 'redir/' . $item['cid'];
-
-
- if (local_user() && ($item['contact-uid'] == local_user())
- && ($item['network'] == NETWORK_DFRN) && (! $item['self'] )) {
- $profile_url = $redirect_url;
+ $profile_url = Contact::MagicLinkById($item['author-id']);
+ if (strpos($profile_url, 'redir/') === 0) {
$sparkle = ' sparkle';
} else {
- $profile_url = $item['url'];
$sparkle = '';
}
- $diff_author = (($item['url'] !== $item['author-link']) ? true : false);
-
- $profile_name = (((strlen($item['author-name'])) && $diff_author) ? $item['author-name'] : $item['name']);
- $profile_avatar = (((strlen($item['author-avatar'])) && $diff_author) ? $item['author-avatar'] : $item['thumb']);
-
- $profile_link = $profile_url;
-
$dropping = (($item['contact-id'] == $contact_id) || ($item['uid'] == local_user()));
- $drop = array(
+ $drop = [
'dropping' => $dropping,
'pagedrop' => false,
- 'select' => t('Select'),
- 'delete' => t('Delete'),
- );
+ 'select' => L10n::t('Select'),
+ 'delete' => L10n::t('Delete'),
+ ];
- $name_e = $profile_name;
$title_e = $item['title'];
- $body_e = bbcode($item['body']);
+ $body_e = BBCode::convert($item['body']);
- $comments .= replace_macros($template,array(
- '$id' => $item['item_id'],
- '$profile_url' => $profile_link,
- '$name' => $name_e,
- '$thumb' => $profile_avatar,
+ $comments .= Renderer::replaceMacros($template,[
+ '$id' => $item['id'],
+ '$profile_url' => $profile_url,
+ '$name' => $item['author-name'],
+ '$thumb' => $item['author-avatar'],
'$sparkle' => $sparkle,
'$title' => $title_e,
'$body' => $body_e,
- '$ago' => relative_date($item['created']),
+ '$ago' => Temporal::getRelativeDate($item['created']),
'$indent' => (($item['parent'] != $item['item_id']) ? ' comment' : ''),
'$drop' => $drop,
'$comment' => $comment
- ));
+ ]);
- if (($can_post || can_write_wall($a, $owner_uid)) && $item['last-child']) {
- $comments .= replace_macros($cmnt_tpl, array(
+ if (($can_post || Security::canWriteToUserWall($owner_uid))) {
+ $comments .= Renderer::replaceMacros($cmnt_tpl, [
'$return_path' => '',
- '$jsreload' => $return_url,
- '$type' => 'wall-comment',
+ '$jsreload' => $return_path,
'$id' => $item['item_id'],
'$parent' => $item['parent'],
'$profile_uid' => $owner_uid,
'$mylink' => $contact['url'],
- '$mytitle' => t('This is you'),
+ '$mytitle' => L10n::t('This is you'),
'$myphoto' => $contact['thumb'],
- '$comment' => t('Comment'),
- '$submit' => t('Submit'),
- '$preview' => t('Preview'),
- '$sourceapp' => t($a->sourcename),
+ '$comment' => L10n::t('Comment'),
+ '$submit' => L10n::t('Submit'),
+ '$preview' => L10n::t('Preview'),
+ '$sourceapp' => L10n::t($a->sourcename),
'$ww' => '',
- '$rand_num' => random_digits(12)
- ));
+ '$rand_num' => Crypto::randomDigits(12)
+ ]);
}
}
}
-
- $paginate = paginate($a);
- }
-
-
- $response_verbs = array('like');
- if (Feature::isEnabled($owner_uid, 'dislike')) {
+ $response_verbs = ['like'];
$response_verbs[] = 'dislike';
- }
- $responses = get_responses($conv_responses,$response_verbs, '', $link_item);
-
- $photo_tpl = get_markup_template('photo_view.tpl');
+ $responses = get_responses($conv_responses, $response_verbs, '', $link_item);
- $album_e = array($album_link, $ph[0]['album']);
- $tags_e = $tags;
- $like_e = $like;
- $dislike_e = $dislike;
+ $paginate = $pager->renderFull($total);
+ }
- $o .= replace_macros($photo_tpl, array(
+ $photo_tpl = Renderer::getMarkupTemplate('photo_view.tpl');
+ $o .= Renderer::replaceMacros($photo_tpl, [
'$id' => $ph[0]['id'],
- '$album' => $album_e,
+ '$album' => [$album_link, $ph[0]['album']],
'$tools' => $tools,
'$lock' => $lock,
'$photo' => $photo,
'$prevlink' => $prevlink,
'$nextlink' => $nextlink,
'$desc' => $ph[0]['desc'],
- '$tags' => $tags_e,
+ '$tags' => $tags,
'$edit' => $edit,
'$map' => $map,
- '$map_text' => t('Map'),
+ '$map_text' => L10n::t('Map'),
'$likebuttons' => $likebuttons,
- '$like' => $like_e,
- '$dislike' => $dikslike_e,
+ '$like' => $like,
+ '$dislike' => $dislike,
'responses' => $responses,
'$comments' => $comments,
'$paginate' => $paginate,
- ));
+ ]);
- $a->page['htmlhead'] .= "\n" . '<meta name="twitter:card" content="photo" />' . "\n";
+ $a->page['htmlhead'] .= "\n" . '<meta name="twitter:card" content="summary_large_image" />' . "\n";
$a->page['htmlhead'] .= '<meta name="twitter:title" content="' . $photo["album"] . '" />' . "\n";
$a->page['htmlhead'] .= '<meta name="twitter:image" content="' . $photo["href"] . '" />' . "\n";
$a->page['htmlhead'] .= '<meta name="twitter:image:width" content="' . $photo["width"] . '" />' . "\n";
// Default - show recent photos with upload link (if applicable)
//$o = '';
-
+ $total = 0;
$r = q("SELECT `resource-id`, max(`scale`) AS `scale` FROM `photo` WHERE `uid` = %d AND `album` != '%s' AND `album` != '%s'
$sql_extra GROUP BY `resource-id`",
intval($a->data['user']['uid']),
- dbesc('Contact Photos'),
- dbesc( t('Contact Photos'))
+ DBA::escape('Contact Photos'),
+ DBA::escape(L10n::t('Contact Photos'))
);
- if (DBM::is_result($r)) {
- $a->set_pager_total(count($r));
- $a->set_pager_itemspage(20);
+ if (DBA::isResult($r)) {
+ $total = count($r);
}
+ $pager = new Pager($a->query_string, 20);
+
$r = q("SELECT `resource-id`, ANY_VALUE(`id`) AS `id`, ANY_VALUE(`filename`) AS `filename`,
ANY_VALUE(`type`) AS `type`, ANY_VALUE(`album`) AS `album`, max(`scale`) AS `scale`,
ANY_VALUE(`created`) AS `created` FROM `photo`
WHERE `uid` = %d AND `album` != '%s' AND `album` != '%s'
$sql_extra GROUP BY `resource-id` ORDER BY `created` DESC LIMIT %d , %d",
intval($a->data['user']['uid']),
- dbesc('Contact Photos'),
- dbesc( t('Contact Photos')),
- intval($a->pager['start']),
- intval($a->pager['itemspage'])
+ DBA::escape('Contact Photos'),
+ DBA::escape(L10n::t('Contact Photos')),
+ $pager->getStart(),
+ $pager->getItemsPerPage()
);
- $photos = array();
- if (DBM::is_result($r)) {
- $twist = 'rotright';
+ $photos = [];
+ if (DBA::isResult($r)) {
+ // "Twist" is only used for the duepunto theme with style "slackr"
+ $twist = false;
foreach ($r as $rr) {
//hide profile photos to others
- if ((! $is_owner) && (! remote_user()) && ($rr['album'] == t('Profile Photos')))
- continue;
+ if (!$is_owner && !remote_user() && ($rr['album'] == L10n::t('Profile Photos'))) {
+ continue;
+ }
- if ($twist == 'rotright')
- $twist = 'rotleft';
- else
- $twist = 'rotright';
+ $twist = !$twist;
$ext = $phototypes[$rr['type']];
$alt_e = $rr['filename'];
$name_e = $rr['album'];
- $photos[] = array(
- 'id' => $rr['id'],
- 'twist' => ' ' . $twist . rand(2,4),
- 'link' => 'photos/' . $a->data['user']['nickname'] . '/image/' . $rr['resource-id'],
- 'title' => t('View Photo'),
- 'src' => 'photo/' . $rr['resource-id'] . '-' . ((($rr['scale']) == 6) ? 4 : $rr['scale']) . '.' . $ext,
- 'alt' => $alt_e,
- 'album' => array(
- 'link' => 'photos/' . $a->data['user']['nickname'] . '/album/' . bin2hex($rr['album']),
- 'name' => $name_e,
- 'alt' => t('View Album'),
- ),
-
- );
+ $photos[] = [
+ 'id' => $rr['id'],
+ 'twist' => ' ' . ($twist ? 'rotleft' : 'rotright') . rand(2,4),
+ 'link' => 'photos/' . $a->data['user']['nickname'] . '/image/' . $rr['resource-id'],
+ 'title' => L10n::t('View Photo'),
+ 'src' => 'photo/' . $rr['resource-id'] . '-' . ((($rr['scale']) == 6) ? 4 : $rr['scale']) . '.' . $ext,
+ 'alt' => $alt_e,
+ 'album' => [
+ 'link' => 'photos/' . $a->data['user']['nickname'] . '/album/' . bin2hex($rr['album']),
+ 'name' => $name_e,
+ 'alt' => L10n::t('View Album'),
+ ],
+
+ ];
}
}
- $tpl = get_markup_template('photos_recent.tpl');
- $o .= replace_macros($tpl, array(
- '$title' => t('Recent Photos'),
+ $tpl = Renderer::getMarkupTemplate('photos_recent.tpl');
+ $o .= Renderer::replaceMacros($tpl, [
+ '$title' => L10n::t('Recent Photos'),
'$can_post' => $can_post,
- '$upload' => array(t('Upload New Photos'), 'photos/'.$a->data['user']['nickname'].'/upload'),
+ '$upload' => [L10n::t('Upload New Photos'), 'photos/'.$a->data['user']['nickname'].'/upload'],
'$photos' => $photos,
- '$paginate' => paginate($a),
- ));
+ '$paginate' => $pager->renderFull($total),
+ ]);
return $o;
}