From e4adaa99009356e581fb9a4a5ceacf7ae3993ef0 Mon Sep 17 00:00:00 2001 From: Michael Date: Tue, 19 Jun 2018 17:11:59 +0000 Subject: [PATCH] Standards and variable renaming --- include/api.php | 10 +++++----- mod/editpost.php | 43 +++++++++++++++---------------------------- mod/viewsrc.php | 4 ++-- 3 files changed, 22 insertions(+), 35 deletions(-) diff --git a/include/api.php b/include/api.php index fa4293c1b..8b0d0c0d9 100644 --- a/include/api.php +++ b/include/api.php @@ -689,7 +689,7 @@ function api_get_user(App $a, $contact_id = null) $usr = dba::selectFirst('user', ['default-location'], ['uid' => api_user()]); $profile = dba::selectFirst('profile', ['about'], ['uid' => api_user(), 'is-default' => true]); } - $countitms = 0; + $countitems = 0; $countfriends = 0; $countfollowers = 0; $starred = 0; @@ -739,7 +739,7 @@ function api_get_user(App $a, $contact_id = null) 'time_zone' => 'UTC', 'geo_enabled' => false, 'verified' => true, - 'statuses_count' => intval($countitms), + 'statuses_count' => intval($countitems), 'lang' => '', 'contributors_enabled' => false, 'is_translator' => false, @@ -2728,13 +2728,13 @@ function api_format_items_activities(&$item, $type = "json") $condition = ['uid' => $item['uid'], 'thr-parent' => $item['uri']]; $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 //builtin_activity_puller($i, $activities); // get user data and add it to the array of the activity - $user = api_get_user($a, $i['author-id']); - switch ($i['verb']) { + $user = api_get_user($a, $item['author-id']); + switch ($item['verb']) { case ACTIVITY_LIKE: $activities['like'][] = $user; break; diff --git a/mod/editpost.php b/mod/editpost.php index dc98e93d9..04caaf0a2 100644 --- a/mod/editpost.php +++ b/mod/editpost.php @@ -15,29 +15,29 @@ function editpost_content(App $a) { $o = ''; - if (! local_user()) { + if (!local_user()) { notice(L10n::t('Permission denied.') . EOL); return; } $post_id = (($a->argc > 1) ? intval($a->argv[1]) : 0); - if (! $post_id) { + if (!$post_id) { notice(L10n::t('Item not found') . EOL); return; } $fields = ['allow_cid', 'allow_gid', 'deny_cid', 'deny_gid', 'type', 'body', 'title', 'file']; - $itm = Item::selectFirstForUser(local_user(), $fields, ['id' => $post_id, 'uid' => local_user()]); - if (! DBM::is_result($itm)) { + $item = Item::selectFirstForUser(local_user(), $fields, ['id' => $post_id, 'uid' => local_user()]); + if (!DBM::is_result($item)) { notice(L10n::t('Item not found') . EOL); return; } $geotag = ''; - $o .= replace_macros(get_markup_template("section_title.tpl"),[ + $o .= replace_macros(get_markup_template("section_title.tpl"), [ '$title' => L10n::t('Edit post') ]); @@ -60,7 +60,7 @@ function editpost_content(App $a) { $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'; } else { $lockstate = 'unlock'; @@ -69,40 +69,27 @@ function editpost_content(App $a) { $jotplugins = ''; $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; $pubmail_enabled = false; - if(! $mail_disabled) { + if (!$mail_disabled) { $r = q("SELECT * FROM `mailacct` WHERE `uid` = %d AND `server` != '' LIMIT 1", intval(local_user()) ); if (DBM::is_result($r)) { $mail_enabled = true; - if(intval($r[0]['pubmail'])) + if (intval($r[0]['pubmail'])) { $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 .= '
' - . L10n::t("Post to Email") . '
'; - }*/ - - - Addon::callHooks('jot_tool', $jotplugins); //Addon::callHooks('jot_networks', $jotnets); - - //$tpl = replace_macros($tpl,array('$jotplugins' => $jotplugins)); - - $o .= replace_macros($tpl,[ + $o .= replace_macros($tpl, [ '$is_edit' => true, '$return_path' => $_SESSION['return_url'], '$action' => 'item', @@ -123,8 +110,8 @@ function editpost_content(App $a) { '$shortnoloc' => L10n::t('clear location'), '$wait' => L10n::t('Please wait'), '$permset' => L10n::t('Permission settings'), - '$ptyp' => $itm['type'], - '$content' => undo_post_tagging($itm['body']), + '$ptyp' => $item['type'], + '$content' => undo_post_tagging($item['body']), '$post_id' => $post_id, '$baseurl' => System::baseUrl(), '$defloc' => $a->user['default-location'], @@ -133,9 +120,9 @@ function editpost_content(App $a) { '$emailcc' => L10n::t('CC: email addresses'), '$public' => L10n::t('Public post'), '$jotnets' => $jotnets, - '$title' => htmlspecialchars($itm['title']), + '$title' => htmlspecialchars($item['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") : ''), '$emtitle' => L10n::t('Example: bob@example.com, mary@example.com'), '$lockstate' => $lockstate, diff --git a/mod/viewsrc.php b/mod/viewsrc.php index 4b511eab1..087b9f3d2 100644 --- a/mod/viewsrc.php +++ b/mod/viewsrc.php @@ -27,10 +27,10 @@ function viewsrc_content(App $a) if (DBM::is_result($item)) { if (is_ajax()) { - echo str_replace("\n",'
',$item['body']); + echo str_replace("\n", '
', $item['body']); killme(); } else { - $o .= str_replace("\n",'
',$item['body']); + $o .= str_replace("\n", '
', $item['body']); } } return $o;