Standards and variable renaming
This commit is contained in:
parent
a5ca724fd3
commit
e4adaa9900
|
@ -689,7 +689,7 @@ function api_get_user(App $a, $contact_id = null)
|
||||||
$usr = dba::selectFirst('user', ['default-location'], ['uid' => api_user()]);
|
$usr = dba::selectFirst('user', ['default-location'], ['uid' => api_user()]);
|
||||||
$profile = dba::selectFirst('profile', ['about'], ['uid' => api_user(), 'is-default' => true]);
|
$profile = dba::selectFirst('profile', ['about'], ['uid' => api_user(), 'is-default' => true]);
|
||||||
}
|
}
|
||||||
$countitms = 0;
|
$countitems = 0;
|
||||||
$countfriends = 0;
|
$countfriends = 0;
|
||||||
$countfollowers = 0;
|
$countfollowers = 0;
|
||||||
$starred = 0;
|
$starred = 0;
|
||||||
|
@ -739,7 +739,7 @@ function api_get_user(App $a, $contact_id = null)
|
||||||
'time_zone' => 'UTC',
|
'time_zone' => 'UTC',
|
||||||
'geo_enabled' => false,
|
'geo_enabled' => false,
|
||||||
'verified' => true,
|
'verified' => true,
|
||||||
'statuses_count' => intval($countitms),
|
'statuses_count' => intval($countitems),
|
||||||
'lang' => '',
|
'lang' => '',
|
||||||
'contributors_enabled' => false,
|
'contributors_enabled' => false,
|
||||||
'is_translator' => false,
|
'is_translator' => false,
|
||||||
|
@ -2728,13 +2728,13 @@ function api_format_items_activities(&$item, $type = "json")
|
||||||
$condition = ['uid' => $item['uid'], 'thr-parent' => $item['uri']];
|
$condition = ['uid' => $item['uid'], 'thr-parent' => $item['uri']];
|
||||||
$ret = Item::selectForUser($item['uid'], ['author-id', 'verb'], $condition);
|
$ret = Item::selectForUser($item['uid'], ['author-id', 'verb'], $condition);
|
||||||
|
|
||||||
while ($i = dba::fetch($ret)) {
|
while ($item = dba::fetch($ret)) {
|
||||||
// not used as result should be structured like other user data
|
// not used as result should be structured like other user data
|
||||||
//builtin_activity_puller($i, $activities);
|
//builtin_activity_puller($i, $activities);
|
||||||
|
|
||||||
// get user data and add it to the array of the activity
|
// get user data and add it to the array of the activity
|
||||||
$user = api_get_user($a, $i['author-id']);
|
$user = api_get_user($a, $item['author-id']);
|
||||||
switch ($i['verb']) {
|
switch ($item['verb']) {
|
||||||
case ACTIVITY_LIKE:
|
case ACTIVITY_LIKE:
|
||||||
$activities['like'][] = $user;
|
$activities['like'][] = $user;
|
||||||
break;
|
break;
|
||||||
|
|
|
@ -29,8 +29,8 @@ function editpost_content(App $a) {
|
||||||
|
|
||||||
$fields = ['allow_cid', 'allow_gid', 'deny_cid', 'deny_gid',
|
$fields = ['allow_cid', 'allow_gid', 'deny_cid', 'deny_gid',
|
||||||
'type', 'body', 'title', 'file'];
|
'type', 'body', 'title', 'file'];
|
||||||
$itm = Item::selectFirstForUser(local_user(), $fields, ['id' => $post_id, 'uid' => local_user()]);
|
$item = Item::selectFirstForUser(local_user(), $fields, ['id' => $post_id, 'uid' => local_user()]);
|
||||||
if (! DBM::is_result($itm)) {
|
if (!DBM::is_result($item)) {
|
||||||
notice(L10n::t('Item not found') . EOL);
|
notice(L10n::t('Item not found') . EOL);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
@ -60,7 +60,7 @@ function editpost_content(App $a) {
|
||||||
|
|
||||||
$tpl = get_markup_template("jot.tpl");
|
$tpl = get_markup_template("jot.tpl");
|
||||||
|
|
||||||
if (strlen($itm['allow_cid']) || strlen($itm['allow_gid']) || strlen($itm['deny_cid']) || strlen($itm['deny_gid'])) {
|
if (strlen($item['allow_cid']) || strlen($item['allow_gid']) || strlen($item['deny_cid']) || strlen($item['deny_gid'])) {
|
||||||
$lockstate = 'lock';
|
$lockstate = 'lock';
|
||||||
} else {
|
} else {
|
||||||
$lockstate = 'unlock';
|
$lockstate = 'unlock';
|
||||||
|
@ -69,7 +69,7 @@ function editpost_content(App $a) {
|
||||||
$jotplugins = '';
|
$jotplugins = '';
|
||||||
$jotnets = '';
|
$jotnets = '';
|
||||||
|
|
||||||
$mail_disabled = ((function_exists('imap_open') && (! Config::get('system','imap_disabled'))) ? 0 : 1);
|
$mail_disabled = ((function_exists('imap_open') && !Config::get('system','imap_disabled')) ? 0 : 1);
|
||||||
|
|
||||||
$mail_enabled = false;
|
$mail_enabled = false;
|
||||||
$pubmail_enabled = false;
|
$pubmail_enabled = false;
|
||||||
|
@ -80,28 +80,15 @@ function editpost_content(App $a) {
|
||||||
);
|
);
|
||||||
if (DBM::is_result($r)) {
|
if (DBM::is_result($r)) {
|
||||||
$mail_enabled = true;
|
$mail_enabled = true;
|
||||||
if(intval($r[0]['pubmail']))
|
if (intval($r[0]['pubmail'])) {
|
||||||
$pubmail_enabled = true;
|
$pubmail_enabled = true;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
}
|
||||||
// I don't think there's any need for the $jotnets when editing the post,
|
|
||||||
// and including them makes it difficult for the JS-free theme, so let's
|
|
||||||
// disable them
|
|
||||||
/* if($mail_enabled) {
|
|
||||||
$selected = (($pubmail_enabled) ? ' checked="checked" ' : '');
|
|
||||||
$jotnets .= '<div class="profile-jot-net"><input type="checkbox" name="pubmail_enable"' . $selected . ' value="1" /> '
|
|
||||||
. L10n::t("Post to Email") . '</div>';
|
|
||||||
}*/
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
Addon::callHooks('jot_tool', $jotplugins);
|
Addon::callHooks('jot_tool', $jotplugins);
|
||||||
//Addon::callHooks('jot_networks', $jotnets);
|
//Addon::callHooks('jot_networks', $jotnets);
|
||||||
|
|
||||||
|
|
||||||
//$tpl = replace_macros($tpl,array('$jotplugins' => $jotplugins));
|
|
||||||
|
|
||||||
$o .= replace_macros($tpl, [
|
$o .= replace_macros($tpl, [
|
||||||
'$is_edit' => true,
|
'$is_edit' => true,
|
||||||
'$return_path' => $_SESSION['return_url'],
|
'$return_path' => $_SESSION['return_url'],
|
||||||
|
@ -123,8 +110,8 @@ function editpost_content(App $a) {
|
||||||
'$shortnoloc' => L10n::t('clear location'),
|
'$shortnoloc' => L10n::t('clear location'),
|
||||||
'$wait' => L10n::t('Please wait'),
|
'$wait' => L10n::t('Please wait'),
|
||||||
'$permset' => L10n::t('Permission settings'),
|
'$permset' => L10n::t('Permission settings'),
|
||||||
'$ptyp' => $itm['type'],
|
'$ptyp' => $item['type'],
|
||||||
'$content' => undo_post_tagging($itm['body']),
|
'$content' => undo_post_tagging($item['body']),
|
||||||
'$post_id' => $post_id,
|
'$post_id' => $post_id,
|
||||||
'$baseurl' => System::baseUrl(),
|
'$baseurl' => System::baseUrl(),
|
||||||
'$defloc' => $a->user['default-location'],
|
'$defloc' => $a->user['default-location'],
|
||||||
|
@ -133,9 +120,9 @@ function editpost_content(App $a) {
|
||||||
'$emailcc' => L10n::t('CC: email addresses'),
|
'$emailcc' => L10n::t('CC: email addresses'),
|
||||||
'$public' => L10n::t('Public post'),
|
'$public' => L10n::t('Public post'),
|
||||||
'$jotnets' => $jotnets,
|
'$jotnets' => $jotnets,
|
||||||
'$title' => htmlspecialchars($itm['title']),
|
'$title' => htmlspecialchars($item['title']),
|
||||||
'$placeholdertitle' => L10n::t('Set title'),
|
'$placeholdertitle' => L10n::t('Set title'),
|
||||||
'$category' => file_tag_file_to_list($itm['file'], 'category'),
|
'$category' => file_tag_file_to_list($item['file'], 'category'),
|
||||||
'$placeholdercategory' => (Feature::isEnabled(local_user(),'categories') ? L10n::t("Categories \x28comma-separated list\x29") : ''),
|
'$placeholdercategory' => (Feature::isEnabled(local_user(),'categories') ? L10n::t("Categories \x28comma-separated list\x29") : ''),
|
||||||
'$emtitle' => L10n::t('Example: bob@example.com, mary@example.com'),
|
'$emtitle' => L10n::t('Example: bob@example.com, mary@example.com'),
|
||||||
'$lockstate' => $lockstate,
|
'$lockstate' => $lockstate,
|
||||||
|
|
Loading…
Reference in a new issue