X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;ds=sidebyside;f=mod%2Fphotos.php;h=3cb75e539cd83b3a29ede1ee5d7dd28cd61139f5;hb=11cf36105ccd359c9d21a006e13b3767712196b6;hp=bb1b117c5b958609abfe5da298645ae2b981252a;hpb=e37640c44ce0057896cf138cdb16415a81b45c0a;p=friendica.git
diff --git a/mod/photos.php b/mod/photos.php
index bb1b117c5b..3cb75e539c 100644
--- a/mod/photos.php
+++ b/mod/photos.php
@@ -4,34 +4,38 @@
*/
use Friendica\App;
use Friendica\Content\Feature;
+use Friendica\Content\Nav;
+use Friendica\Core\Addon;
use Friendica\Core\System;
use Friendica\Core\Config;
use Friendica\Core\Worker;
use Friendica\Database\DBM;
use Friendica\Model\Contact;
+use Friendica\Model\Group;
use Friendica\Model\Photo;
+use Friendica\Model\Profile;
use Friendica\Network\Probe;
use Friendica\Object\Image;
+use Friendica\Protocol\DFRN;
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()) {
return;
}
- nav_set_selected('home');
+ Nav::setSelected('home');
if ($a->argc > 1) {
$nick = $a->argv[1];
@@ -47,26 +51,26 @@ function photos_init(App $a) {
$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");
- $vcard_widget = replace_macros($tpl, array(
+ $vcard_widget = replace_macros($tpl, [
'$name' => $profile['name'],
'$photo' => $profile['photo'],
'$addr' => defaults($profile, 'addr', ''),
'$account_type' => $account_type,
'$pdesc' => defaults($profile, 'pdesc', ''),
- ));
+ ]);
- $albums = Photo::photoAlbums($a->data['user']['uid']);
+ $albums = Photo::getAlbums($a->data['user']['uid']);
$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;
@@ -74,18 +78,18 @@ function photos_init(App $a) {
$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')))
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;
}
}
@@ -95,15 +99,15 @@ function photos_init(App $a) {
}
if ($ret['success']) {
- $photo_albums_widget = replace_macros(get_markup_template('photo_albums.tpl'), array(
+ $photo_albums_widget = replace_macros(get_markup_template('photo_albums.tpl'), [
'$nick' => $a->data['user']['nickname'],
'$title' => t('Photo Albums'),
'$recent' => t('Recent Photos'),
'$albums' => $ret['albums'],
'$baseurl' => System::baseUrl(),
- '$upload' => array(t('Upload New Photos'), 'photos/' . $a->data['user']['nickname'] . '/upload'),
+ '$upload' => [t('Upload New Photos'), 'photos/' . $a->data['user']['nickname'] . '/upload'],
'$can_post' => $can_post
- ));
+ ]);
}
@@ -114,9 +118,9 @@ function photos_init(App $a) {
$a->page['aside'] .= $photo_albums_widget;
$tpl = get_markup_template("photos_head.tpl");
- $a->page['htmlhead'] .= replace_macros($tpl,array(
+ $a->page['htmlhead'] .= replace_macros($tpl,[
'$ispublic' => t('everybody')
- ));
+ ]);
}
return;
@@ -212,7 +216,7 @@ function photos_post(App $a)
intval($page_owner_uid)
);
// Update the photo albums cache
- Photo::photoAlbums($page_owner_uid, true);
+ Photo::clearAlbumCache($page_owner_uid);
$newurl = str_replace(bin2hex($album), bin2hex($newalbum), $_SESSION['photo_return']);
goaway($newurl);
@@ -227,10 +231,10 @@ function photos_post(App $a)
// Check if we should do HTML-based delete confirmation
if (x($_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'] = replace_macros(get_markup_template('confirm.tpl'), [
'$method' => 'post',
'$message' => t('Do you really want to delete this photo album and all its photos?'),
'$extra_inputs' => $extra_inputs,
@@ -238,12 +242,12 @@ function photos_post(App $a)
'$confirm_url' => $drop_url,
'$confirm_name' => 'dropalbum', // Needed so that confirmation will bring us back into this if statement
'$cancel' => 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
@@ -299,7 +303,7 @@ function photos_post(App $a)
}
// Update the photo albums cache
- Photo::photoAlbums($page_owner_uid, true);
+ Photo::clearAlbumCache($page_owner_uid);
}
goaway('photos/' . $a->data['user']['nickname']);
@@ -319,15 +323,15 @@ function photos_post(App $a)
// Check if we should do HTML-based delete confirmation
if (x($_REQUEST, 'confirm')) {
$drop_url = $a->query_string;
- $a->page['content'] = replace_macros(get_markup_template('confirm.tpl'), array(
+ $a->page['content'] = replace_macros(get_markup_template('confirm.tpl'), [
'$method' => 'post',
'$message' => t('Do you really want to delete this photo?'),
- '$extra_inputs' => array(),
+ '$extra_inputs' => [],
'$confirm' => 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'),
- ));
+ ]);
$a->error = 1; // Set $a->error so the other module functions don't execute
return;
}
@@ -367,7 +371,7 @@ function photos_post(App $a)
$drop_id = intval($i[0]['id']);
// Update the photo albums cache
- Photo::photoAlbums($page_owner_uid, true);
+ Photo::clearAlbumCache($page_owner_uid);
if ($i[0]['visible']) {
Worker::add(PRIORITY_HIGH, "Notifier", "drop", $drop_id);
@@ -471,7 +475,7 @@ function photos_post(App $a)
// Update the photo albums cache if album name was changed
if ($albname !== $origaname) {
- Photo::photoAlbums($page_owner_uid, true);
+ Photo::clearAlbumCache($page_owner_uid);
}
}
@@ -487,7 +491,7 @@ function photos_post(App $a)
$title = '';
$uri = item_new_uri($a->get_hostname(),$page_owner_uid);
- $arr = array();
+ $arr = [];
$arr['guid'] = get_guid(32);
$arr['uid'] = $page_owner_uid;
$arr['uri'] = $uri;
@@ -507,7 +511,6 @@ function photos_post(App $a)
$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;
@@ -539,7 +542,7 @@ function photos_post(App $a)
$rawtags = '#' . $rawtags;
}
- $taginfo = array();
+ $taginfo = [];
$tags = get_tags($rawtags);
if (count($tags)) {
@@ -564,7 +567,7 @@ function photos_post(App $a)
}
}
}
- $taginfo[] = array($newname, $profile, $salmon);
+ $taginfo[] = [$newname, $profile, $salmon];
} else {
$newname = $name;
$alias = '';
@@ -609,9 +612,9 @@ function photos_post(App $a)
}
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 .= ',';
@@ -665,7 +668,7 @@ function photos_post(App $a)
foreach ($taginfo as $tagged) {
$uri = item_new_uri($a->get_hostname(), $page_owner_uid);
- $arr = array();
+ $arr = [];
$arr['guid'] = get_guid(32);
$arr['uid'] = $page_owner_uid;
$arr['uri'] = $uri;
@@ -684,7 +687,6 @@ function photos_post(App $a)
$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['object-type'] = ACTIVITY_OBJ_PERSON;
@@ -719,7 +721,7 @@ function photos_post(App $a)
// default post action - upload a photo
- call_hooks('photo_post_init', $_POST);
+ Addon::callHooks('photo_post_init', $_POST);
// Determine the album to use
$album = x($_REQUEST, 'album') ? notags(trim($_REQUEST['album'])) : '';
@@ -767,9 +769,9 @@ function photos_post(App $a)
$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')) {
$src = $ret['src'];
@@ -807,7 +809,7 @@ function photos_post(App $a)
}
@unlink($src);
$foo = 0;
- call_hooks('photo_post_end', $foo);
+ Addon::callHooks('photo_post_end', $foo);
return;
}
@@ -823,7 +825,7 @@ function photos_post(App $a)
notice(t('Image exceeds size limit of %s', formatBytes($maximagesize)) . EOL);
@unlink($src);
$foo = 0;
- call_hooks('photo_post_end', $foo);
+ Addon::callHooks('photo_post_end', $foo);
return;
}
@@ -831,7 +833,7 @@ function photos_post(App $a)
notice(t('Image file is empty.') . EOL);
@unlink($src);
$foo = 0;
- call_hooks('photo_post_end', $foo);
+ Addon::callHooks('photo_post_end', $foo);
return;
}
@@ -846,7 +848,7 @@ function photos_post(App $a)
notice(t('Unable to process image.') . EOL);
@unlink($src);
$foo = 0;
- call_hooks('photo_post_end',$foo);
+ Addon::callHooks('photo_post_end',$foo);
killme();
}
@@ -897,7 +899,7 @@ function photos_post(App $a)
$lon = Photo::getGps($exif['GPS']['GPSLongitude'], $exif['GPS']['GPSLongitudeRef']);
}
- $arr = array();
+ $arr = [];
if ($lat && $lon) {
$arr['coord'] = $lat . ' ' . $lon;
}
@@ -921,7 +923,6 @@ function photos_post(App $a)
$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;
@@ -931,13 +932,13 @@ function photos_post(App $a)
$item_id = item_store($arr);
// Update the photo albums cache
- Photo::photoAlbums($page_owner_uid, true);
+ Photo::clearAlbumCache($page_owner_uid);
if ($visible) {
Worker::add(PRIORITY_HIGH, "Notifier", 'wall-new', $item_id);
}
- call_hooks('photo_post_end',intval($item_id));
+ Addon::callHooks('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
@@ -1045,7 +1046,7 @@ function photos_content(App $a)
}
}
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)
@@ -1073,7 +1074,7 @@ function photos_content(App $a)
// tabs
$is_owner = (local_user() && (local_user() == $owner_uid));
- $o .= profile_tabs($a, $is_owner, $a->data['user']['nickname']);
+ $o .= Profile::getTabs($a, $is_owner, $a->data['user']['nickname']);
// Display upload form
if ($datatype === 'upload') {
@@ -1099,16 +1100,16 @@ function photos_content(App $a)
$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(
+ $default_upload_box = replace_macros(get_markup_template('photos_default_uploader_box.tpl'), []);
+ $default_upload_submit = replace_macros(get_markup_template('photos_default_uploader_submit.tpl'), [
'$submit' => t('Submit'),
- ));
+ ]);
$usage_message = '';
@@ -1116,7 +1117,7 @@ function photos_content(App $a)
$aclselect_e = ($visitor ? '' : populate_acl($a->user));
- $o .= replace_macros($tpl,array(
+ $o .= replace_macros($tpl,[
'$pagename' => t('Upload Photos'),
'$sessid' => session_id(),
'$usage' => $usage_message,
@@ -1133,11 +1134,10 @@ function photos_content(App $a)
'$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'),
'$return_path' => $a->query_string,
- ));
+ ]);
return $o;
}
@@ -1183,29 +1183,29 @@ function photos_content(App $a)
$album_e = $album;
- $o .= replace_macros($edit_tpl,array(
+ $o .= replace_macros($edit_tpl,[
'$nametext' => t('New album name: '),
'$nickname' => $a->data['user']['nickname'],
'$album' => $album_e,
'$hexalbum' => bin2hex($album),
'$submit' => t('Submit'),
'$dropsubmit' => 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');
+ $edit = [t('Edit Album'), 'photos/' . $a->data['user']['nickname'] . '/album/' . bin2hex($album) . '/edit'];
}
}
if ($order_field === 'posted') {
- $order = array(t('Show Newest First'), 'photos/' . $a->data['user']['nickname'] . '/album/' . bin2hex($album));
+ $order = [t('Show Newest First'), 'photos/' . $a->data['user']['nickname'] . '/album/' . bin2hex($album)];
} else {
- $order = array(t('Show Oldest First'), 'photos/' . $a->data['user']['nickname'] . '/album/' . bin2hex($album) . '?f=&order=posted');
+ $order = [t('Show Oldest First'), 'photos/' . $a->data['user']['nickname'] . '/album/' . bin2hex($album) . '?f=&order=posted'];
}
- $photos = array();
+ $photos = [];
if (DBM::is_result($r)) {
// "Twist" is only used for the duepunto theme with style "slackr"
@@ -1218,7 +1218,7 @@ function photos_content(App $a)
$imgalt_e = $rr['filename'];
$desc_e = $rr['desc'];
- $photos[] = array(
+ $photos[] = [
'id' => $rr['id'],
'twist' => ' ' . ($twist ? 'rotleft' : 'rotright') . rand(2,4),
'link' => 'photos/' . $a->data['user']['nickname'] . '/image/' . $rr['resource-id']
@@ -1229,20 +1229,20 @@ function photos_content(App $a)
'desc'=> $desc_e,
'ext' => $ext,
'hash'=> $rr['resource-id'],
- );
+ ];
}
}
$tpl = get_markup_template('photo_album.tpl');
- $o .= replace_macros($tpl, array(
+ $o .= replace_macros($tpl, [
'$photos' => $photos,
'$album' => $album,
'$can_post' => $can_post,
- '$upload' => array(t('Upload New Photos'), 'photos/' . $a->data['user']['nickname'] . '/upload/' . bin2hex($album)),
+ '$upload' => [t('Upload New Photos'), 'photos/' . $a->data['user']['nickname'] . '/upload/' . bin2hex($album)],
'$order' => $order,
'$edit' => $edit,
'$paginate' => paginate($a),
- ));
+ ]);
return $o;
@@ -1328,10 +1328,10 @@ function photos_content(App $a)
$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') ? t('View photo') : t('Edit photo'))],
+ 'profile'=>['profile_photo/use/'.$ph[0]['resource-id'], t('Use as profile photo')],
+ ];
// lock
$lock = ( ( ($ph[0]['uid'] == local_user()) && (strlen($ph[0]['allow_cid']) || strlen($ph[0]['allow_gid'])
@@ -1344,16 +1344,16 @@ function photos_content(App $a)
if ( $cmd === 'edit') {
$tpl = get_markup_template('photo_edit_head.tpl');
- $a->page['htmlhead'] .= replace_macros($tpl,array(
+ $a->page['htmlhead'] .= replace_macros($tpl,[
'$prevlink' => $prevlink,
'$nextlink' => $nextlink
- ));
+ ]);
}
if ($prevlink)
- $prevlink = array($prevlink, '') ;
+ $prevlink = [$prevlink, ''] ;
- $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'),
@@ -1361,10 +1361,10 @@ function photos_content(App $a)
'width' => $hires['width'],
'album' => $hires['album'],
'filename' => $hires['filename'],
- );
+ ];
if ($nextlink) {
- $nextlink = array($nextlink, '');
+ $nextlink = [$nextlink, ''];
}
@@ -1446,7 +1446,7 @@ function photos_content(App $a)
}
$tag_str .= bbcode($t);
}
- $tags = array(t('Tags: '), $tag_str);
+ $tags = [t('Tags: '), $tag_str];
if ($cmd === 'edit') {
$tags[] = 'tagrm/' . $link_item['id'];
$tags[] = t('[Remove any tag]');
@@ -1462,14 +1462,14 @@ function photos_content(App $a)
$caption_e = $ph[0]['desc'];
$aclselect_e = populate_acl($ph[0]);
- $edit = replace_macros($edit_tpl, array(
+ $edit = replace_macros($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', t('New album name'), $album_e,''],
+ '$caption' => ['desc', t('Caption'), $caption_e, ''],
+ '$tags' => ['newtag', t('Add a Tag'), "", t('Example: @bob, @Barbara_Jensen, @jim@example.com, #California, #camping')],
+ '$rotate_none' => ['rotate', t('Do not rotate'),0,'', true],
+ '$rotate_cw' => ['rotate', t('Rotate CW (right)'),1,''],
+ '$rotate_ccw' => ['rotate', t('Rotate CCW (left)'),2,''],
'$nickname' => $a->data['user']['nickname'],
'$resource_id' => $ph[0]['resource-id'],
@@ -1481,11 +1481,10 @@ function photos_content(App $a)
'$delete' => 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'),
'$return_path' => $a->query_string,
- ));
+ ]);
}
$like = '';
@@ -1500,20 +1499,20 @@ function photos_content(App $a)
$tpl = get_markup_template('photo_item.tpl');
$return_url = $a->cmd;
- if ($can_post || can_write_wall($a, $owner_uid)) {
+ if ($can_post || can_write_wall($owner_uid)) {
$like_tpl = get_markup_template('like_noshare.tpl');
- $likebuttons = replace_macros($like_tpl, array(
+ $likebuttons = replace_macros($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'),
'$return_path' => $a->query_string,
- ));
+ ]);
}
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 (($can_post || can_write_wall($owner_uid))) {
+ $comments .= replace_macros($cmnt_tpl, [
'$return_path' => '',
'$jsreload' => $return_url,
'$type' => 'wall-comment',
@@ -1529,14 +1528,14 @@ function photos_content(App $a)
'$sourceapp' => t($a->sourcename),
'$ww' => '',
'$rand_num' => random_digits(12)
- ));
+ ]);
}
}
- $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' => t('Likes','title')],'dislike' => ['title' => t('Dislikes','title')],
+ 'attendyes' => ['title' => t('Attending','title')], 'attendno' => ['title' => t('Not attending','title')], 'attendmaybe' => ['title' => t('Might attend','title')]
+ ];
// display comments
if (DBM::is_result($r)) {
@@ -1551,8 +1550,8 @@ function photos_content(App $a)
$dislike = format_like($conv_responses['dislike'][$link_item['uri']], $conv_responses['dislike'][$link_item['uri'] . '-l'], 'dislike', $link_item['id']);
}
- if (($can_post || can_write_wall($a, $owner_uid)) && $link_item['last-child']) {
- $comments .= replace_macros($cmnt_tpl,array(
+ if (($can_post || can_write_wall($owner_uid))) {
+ $comments .= replace_macros($cmnt_tpl,[
'$return_path' => '',
'$jsreload' => $return_url,
'$type' => 'wall-comment',
@@ -1568,7 +1567,7 @@ function photos_content(App $a)
'$sourceapp' => t($a->sourcename),
'$ww' => '',
'$rand_num' => random_digits(12)
- ));
+ ]);
}
foreach ($r as $item) {
@@ -1599,18 +1598,18 @@ function photos_content(App $a)
$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'),
- );
+ ];
$name_e = $profile_name;
$title_e = $item['title'];
$body_e = bbcode($item['body']);
- $comments .= replace_macros($template,array(
+ $comments .= replace_macros($template,[
'$id' => $item['item_id'],
'$profile_url' => $profile_link,
'$name' => $name_e,
@@ -1622,10 +1621,10 @@ function photos_content(App $a)
'$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 || can_write_wall($owner_uid))) {
+ $comments .= replace_macros($cmnt_tpl, [
'$return_path' => '',
'$jsreload' => $return_url,
'$type' => 'wall-comment',
@@ -1641,11 +1640,11 @@ function photos_content(App $a)
'$sourceapp' => t($a->sourcename),
'$ww' => '',
'$rand_num' => random_digits(12)
- ));
+ ]);
}
}
}
- $response_verbs = array('like');
+ $response_verbs = ['like'];
if (Feature::isEnabled($owner_uid, 'dislike')) {
$response_verbs[] = 'dislike';
}
@@ -1655,7 +1654,7 @@ function photos_content(App $a)
}
$photo_tpl = get_markup_template('photo_view.tpl');
- $o .= replace_macros($photo_tpl, array(
+ $o .= replace_macros($photo_tpl, [
'$id' => $ph[0]['id'],
'$album' => [$album_link, $ph[0]['album']],
'$tools' => $tools,
@@ -1674,7 +1673,7 @@ function photos_content(App $a)
'responses' => $responses,
'$comments' => $comments,
'$paginate' => $paginate,
- ));
+ ]);
$a->page['htmlhead'] .= "\n" . '' . "\n";
$a->page['htmlhead'] .= '' . "\n";
@@ -1711,7 +1710,7 @@ function photos_content(App $a)
intval($a->pager['itemspage'])
);
- $photos = array();
+ $photos = [];
if (DBM::is_result($r)) {
// "Twist" is only used for the duepunto theme with style "slackr"
$twist = false;
@@ -1727,31 +1726,31 @@ function photos_content(App $a)
$alt_e = $rr['filename'];
$name_e = $rr['album'];
- $photos[] = array(
+ $photos[] = [
'id' => $rr['id'],
'twist' => ' ' . ($twist ? 'rotleft' : 'rotright') . 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(
+ 'album' => [
'link' => 'photos/' . $a->data['user']['nickname'] . '/album/' . bin2hex($rr['album']),
'name' => $name_e,
'alt' => t('View Album'),
- ),
+ ],
- );
+ ];
}
}
$tpl = get_markup_template('photos_recent.tpl');
- $o .= replace_macros($tpl, array(
+ $o .= replace_macros($tpl, [
'$title' => t('Recent Photos'),
'$can_post' => $can_post,
- '$upload' => array(t('Upload New Photos'), 'photos/'.$a->data['user']['nickname'].'/upload'),
+ '$upload' => [t('Upload New Photos'), 'photos/'.$a->data['user']['nickname'].'/upload'],
'$photos' => $photos,
'$paginate' => paginate($a),
- ));
+ ]);
return $o;
}