Browse Source

Rename to singular

Rename and update references. Standards and a require_once.
pull/4005/head
Adam Magness 3 years ago
parent
commit
6e5471def3
22 changed files with 59 additions and 56 deletions
  1. +1
    -1
      include/acl_selectors.php
  2. +1
    -1
      include/api.php
  3. +3
    -3
      include/contact_widgets.php
  4. +3
    -3
      include/conversation.php
  5. +2
    -2
      include/event.php
  6. +3
    -3
      include/identity.php
  7. +1
    -1
      include/items.php
  8. +1
    -1
      include/nav.php
  9. +1
    -1
      include/tags.php
  10. +1
    -1
      include/text.php
  11. +2
    -2
      mod/admin.php
  12. +1
    -1
      mod/cal.php
  13. +1
    -1
      mod/editpost.php
  14. +7
    -7
      mod/network.php
  15. +3
    -3
      mod/photos.php
  16. +2
    -2
      mod/ping.php
  17. +3
    -3
      mod/profiles.php
  18. +1
    -1
      mod/search.php
  19. +3
    -3
      mod/settings.php
  20. +9
    -6
      src/Content/Feature.php
  21. +2
    -2
      src/Content/ForumManager.php
  22. +8
    -8
      src/Object/Item.php

+ 1
- 1
include/acl_selectors.php View File

@ -377,7 +377,7 @@ function populate_acl($user = null, $show_jotnets = false) {
'$aclModalTitle' => t('Permissions'),
'$aclModalDismiss' => t('Close'),
'$features' => array(
'aclautomention' => (Features::isEnabled($user['uid'], "aclautomention") ? "true" : "false")
'aclautomention' => (Feature::isEnabled($user['uid'], "aclautomention") ? "true" : "false")
),
));


+ 1
- 1
include/api.php View File

@ -5101,7 +5101,7 @@ function api_friendica_profile_show($type)
$profileid = (x($_REQUEST, 'profile_id') ? $_REQUEST['profile_id'] : 0);
// retrieve general information about profiles for user
$multi_profiles = Features::isEnabled(api_user(), 'multi_profiles');
$multi_profiles = Feature::isEnabled(api_user(), 'multi_profiles');
$directory = Config::get('system', 'directory');
// get data of the specified profile id or all profiles of the user if not specified


+ 3
- 3
include/contact_widgets.php View File

@ -108,7 +108,7 @@ function networks_widget($baseurl, $selected = '') {
return '';
}
if (!Features::isEnabled(local_user(), 'networks')) {
if (!Feature::isEnabled(local_user(), 'networks')) {
return '';
}
@ -147,7 +147,7 @@ function fileas_widget($baseurl, $selected = '') {
return '';
}
if (! Features::isEnabled(local_user(), 'filing')) {
if (! Feature::isEnabled(local_user(), 'filing')) {
return '';
}
@ -181,7 +181,7 @@ function categories_widget($baseurl, $selected = '') {
$a = get_app();
if (! Features::isEnabled($a->profile['profile_uid'], 'categories')) {
if (! Feature::isEnabled($a->profile['profile_uid'], 'categories')) {
return '';
}


+ 3
- 3
include/conversation.php View File

@ -916,7 +916,7 @@ function conversation(App $a, $items, $mode, $update, $preview = false) {
'$mode' => $mode,
'$user' => $a->user,
'$threads' => $threads,
'$dropping' => ($page_dropping && Features::isEnabled(local_user(), 'multi_delete') ? t('Delete Selected Items') : False),
'$dropping' => ($page_dropping && Feature::isEnabled(local_user(), 'multi_delete') ? t('Delete Selected Items') : False),
));
return $o;
@ -1306,7 +1306,7 @@ function status_editor(App $a, $x, $notes_cid = 0, $popup = false) {
'$title' => $x['title'],
'$placeholdertitle' => t('Set title'),
'$category' => $x['category'],
'$placeholdercategory' => (Features::isEnabled(local_user(), 'categories') ? t('Categories (comma-separated list)') : ''),
'$placeholdercategory' => (Feature::isEnabled(local_user(), 'categories') ? t('Categories (comma-separated list)') : ''),
'$wait' => t('Please wait'),
'$permset' => t('Permission settings'),
'$shortpermset' => t('permissions'),
@ -1322,7 +1322,7 @@ function status_editor(App $a, $x, $notes_cid = 0, $popup = false) {
'$lockstate' => $x['lockstate'],
'$bang' => $x['bang'],
'$profile_uid' => $x['profile_uid'],
'$preview' => ((Features::isEnabled($x['profile_uid'],'preview')) ? t('Preview') : ''),
'$preview' => ((Feature::isEnabled($x['profile_uid'],'preview')) ? t('Preview') : ''),
'$jotplugins' => $jotplugins,
'$notes_cid' => $notes_cid,
'$sourceapp' => t($a->sourcename),


+ 2
- 2
include/event.php View File

@ -900,7 +900,7 @@ function widget_events() {
* for exporting the cal is enabled (otherwise the widget would appear for logged in users
* on foreigen profile pages even if the widget is disabled).
*/
if (intval($owner_uid) && local_user() !== $owner_uid && ! Features::isEnabled($owner_uid, "export_calendar")) {
if (intval($owner_uid) && local_user() !== $owner_uid && ! Feature::isEnabled($owner_uid, "export_calendar")) {
return;
}
@ -908,7 +908,7 @@ function widget_events() {
* If it's a kind of profile page (intval($owner_uid)) return if the user not logged in and
* export feature isn't enabled.
*/
if (intval($owner_uid) && ! local_user() && ! Features::isEnabled($owner_uid, "export_calendar")) {
if (intval($owner_uid) && ! local_user() && ! Feature::isEnabled($owner_uid, "export_calendar")) {
return;
}


+ 3
- 3
include/identity.php View File

@ -310,7 +310,7 @@ function profile_sidebar($profile, $block = 0)
}
// show edit profile to yourself
if (!$is_contact && $profile['uid'] == local_user() && Features::isEnabled(local_user(), 'multi_profiles')) {
if (!$is_contact && $profile['uid'] == local_user() && Feature::isEnabled(local_user(), 'multi_profiles')) {
$profile['edit'] = array(System::baseUrl(). '/profiles', t('Profiles'),"", t('Manage/edit profiles'));
$r = q(
"SELECT * FROM `profile` WHERE `uid` = %d",
@ -337,7 +337,7 @@ function profile_sidebar($profile, $block = 0)
}
}
}
if (!$is_contact && $profile['uid'] == local_user() && !Features::isEnabled(local_user(), 'multi_profiles')) {
if (!$is_contact && $profile['uid'] == local_user() && !Feature::isEnabled(local_user(), 'multi_profiles')) {
$profile['edit'] = array(System::baseUrl(). '/profiles/'.$profile['id'], t('Edit profile'),"", t('Edit profile'));
$profile['menu'] = array(
'chg_photo' => t('Change profile photo'),
@ -791,7 +791,7 @@ function advanced_profile(App $a)
}
//show subcribed forum if it is enabled in the usersettings
if (Features::isEnabled($uid, 'forumlist_profile')) {
if (Feature::isEnabled($uid, 'forumlist_profile')) {
$profile['forumlist'] = array( t('Forums:'), ForumManager::profileAdvanced($uid));
}


+ 1
- 1
include/items.php View File

@ -2356,7 +2356,7 @@ function posted_dates($uid, $wall) {
function posted_date_widget($url, $uid, $wall) {
$o = '';
if (! Features::isEnabled($uid, 'archives')) {
if (! Feature::isEnabled($uid, 'archives')) {
return $o;
}


+ 1
- 1
include/nav.php View File

@ -193,7 +193,7 @@ function nav_info(App $a)
$nav['settings'] = array('settings', t('Settings'), '', t('Account settings'));
if (Features::isEnabled(local_user(), 'multi_profiles')) {
if (Feature::isEnabled(local_user(), 'multi_profiles')) {
$nav['profiles'] = array('profiles', t('Profiles'), '', t('Manage/Edit Profiles'));
}


+ 1
- 1
include/tags.php View File

@ -305,7 +305,7 @@ function tagcloud_wall_widget($limit = 50) {
return "";
}
if(Features::isEnabled($a->profile['profile_uid'], 'tagadelic')) {
if(Feature::isEnabled($a->profile['profile_uid'], 'tagadelic')) {
$owner_id = Contact::getIdForURL($a->profile['url']);
if(!$owner_id) {


+ 1
- 1
include/text.php View File

@ -1049,7 +1049,7 @@ function search($s, $id = 'search-box', $url = 'search', $save = false, $aside =
'$action_url' => $url,
'$search_label' => t('Search'),
'$save_label' => t('Save'),
'$savedsearch' => Features::isEnabled(local_user(),'savedsearch'),
'$savedsearch' => Feature::isEnabled(local_user(),'savedsearch'),
'$search_hint' => t('@name, !forum, #tags, content'),
);


+ 2
- 2
mod/admin.php View File

@ -2291,7 +2291,7 @@ function admin_page_features_post(App $a)
logger('postvars: ' . print_r($_POST, true), LOGGER_DATA);
$arr = array();
$features = Features::get(false);
$features = Feature::get(false);
foreach ($features as $fname => $fdata) {
foreach (array_slice($fdata, 1) as $f) {
@ -2336,7 +2336,7 @@ function admin_page_features(App $a)
{
if ((argc() > 1) && (argv(1) === 'features')) {
$arr = array();
$features = Features::get(false);
$features = Feature::get(false);
foreach ($features as $fname => $fdata) {
$arr[$fname] = array();


+ 1
- 1
mod/cal.php View File

@ -301,7 +301,7 @@ function cal_content(App $a) {
// Test permissions
// Respect the export feature setting for all other /cal pages if it's not the own profile
if( ((local_user() !== intval($owner_uid))) && ! Features::isEnabled($owner_uid, "export_calendar")) {
if( ((local_user() !== intval($owner_uid))) && ! Feature::isEnabled($owner_uid, "export_calendar")) {
notice( t('Permission denied.') . EOL);
goaway('cal/' . $nick);
}


+ 1
- 1
mod/editpost.php View File

@ -134,7 +134,7 @@ function editpost_content(App $a) {
'$title' => htmlspecialchars($itm[0]['title']),
'$placeholdertitle' => t('Set title'),
'$category' => file_tag_file_to_list($itm[0]['file'], 'category'),
'$placeholdercategory' => (Features::isEnabled(local_user(),'categories') ? t('Categories (comma-separated list)') : ''),
'$placeholdercategory' => (Feature::isEnabled(local_user(),'categories') ? t('Categories (comma-separated list)') : ''),
'$emtitle' => t('Example: bob@example.com, mary@example.com'),
'$lockstate' => $lockstate,
'$acl' => '', // populate_acl((($group) ? $group_acl : $a->user)),


+ 7
- 7
mod/network.php View File

@ -157,8 +157,8 @@ function network_init(App $a) {
$a->page['aside'] = '';
}
$a->page['aside'] .= (Features::isEnabled(local_user(),'groups') ? group_side('network/0','network','standard',$group_id) : '');
$a->page['aside'] .= (Features::isEnabled(local_user(), 'forumlist_widget') ? ForumManager::widget(local_user(), $cid) : '');
$a->page['aside'] .= (Feature::isEnabled(local_user(),'groups') ? group_side('network/0','network','standard',$group_id) : '');
$a->page['aside'] .= (Feature::isEnabled(local_user(), 'forumlist_widget') ? ForumManager::widget(local_user(), $cid) : '');
$a->page['aside'] .= posted_date_widget('network',local_user(),false);
$a->page['aside'] .= networks_widget('network',(x($_GET, 'nets') ? $_GET['nets'] : ''));
$a->page['aside'] .= saved_searches($search);
@ -167,7 +167,7 @@ function network_init(App $a) {
function saved_searches($search) {
if (!Features::isEnabled(local_user(),'savedsearch')) {
if (!Feature::isEnabled(local_user(),'savedsearch')) {
return '';
}
@ -919,7 +919,7 @@ function network_tabs(App $a)
),
);
if (Features::isEnabled(local_user(),'personal_tab')) {
if (Feature::isEnabled(local_user(),'personal_tab')) {
$tabs[] = array(
'label' => t('Personal'),
'url' => str_replace('/new', '', $cmd) . ((x($_GET,'cid')) ? '/?f=&cid=' . $_GET['cid'] : '/?f=') . '&conv=1',
@ -930,7 +930,7 @@ function network_tabs(App $a)
);
}
if (Features::isEnabled(local_user(),'new_tab')) {
if (Feature::isEnabled(local_user(),'new_tab')) {
$tabs[] = array(
'label' => t('New'),
'url' => 'network/new' . ((x($_GET,'cid')) ? '/?f=&cid=' . $_GET['cid'] : ''),
@ -941,7 +941,7 @@ function network_tabs(App $a)
);
}
if (Features::isEnabled(local_user(),'link_tab')) {
if (Feature::isEnabled(local_user(),'link_tab')) {
$tabs[] = array(
'label' => t('Shared Links'),
'url' => str_replace('/new', '', $cmd) . ((x($_GET,'cid')) ? '/?f=&cid=' . $_GET['cid'] : '/?f=') . '&bmark=1',
@ -952,7 +952,7 @@ function network_tabs(App $a)
);
}
if (Features::isEnabled(local_user(),'star_posts')) {
if (Feature::isEnabled(local_user(),'star_posts')) {
$tabs[] = array(
'label' => t('Starred'),
'url' => str_replace('/new', '', $cmd) . ((x($_GET,'cid')) ? '/?f=&cid=' . $_GET['cid'] : '/?f=') . '&star=1',


+ 3
- 3
mod/photos.php View File

@ -896,7 +896,7 @@ function photos_post(App $a) {
/// @TODO merge these 2 if() into one?
if ($exif && $exif['GPS']) {
if (Features::isEnabled($channel_id,'photo_location')) {
if (Feature::isEnabled($channel_id,'photo_location')) {
$lat = getGps($exif['GPS']['GPSLatitude'], $exif['GPS']['GPSLatitudeRef']);
$lon = getGps($exif['GPS']['GPSLongitude'], $exif['GPS']['GPSLongitudeRef']);
}
@ -1585,7 +1585,7 @@ function photos_content(App $a) {
$likebuttons = replace_macros($like_tpl, array(
'$id' => $link_item['id'],
'$likethis' => t("I like this \x28toggle\x29"),
'$nolike' => (Features::isEnabled(local_user(), 'dislike') ? t("I don't 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,
));
@ -1736,7 +1736,7 @@ function photos_content(App $a) {
$response_verbs = array('like');
if (Features::isEnabled($owner_uid, 'dislike')) {
if (Feature::isEnabled($owner_uid, 'dislike')) {
$response_verbs[] = 'dislike';
}
$responses = get_responses($conv_responses,$response_verbs, '', $link_item);


+ 2
- 2
mod/ping.php View File

@ -150,7 +150,7 @@ function ping_init(App $a)
}
if ($network_count) {
if (intval(Features::isEnabled(local_user(), 'groups'))) {
if (intval(Feature::isEnabled(local_user(), 'groups'))) {
// Find out how unseen network posts are spread across groups
$group_counts = groups_count_unseen();
if (DBM::is_result($group_counts)) {
@ -162,7 +162,7 @@ function ping_init(App $a)
}
}
if (intval(Features::isEnabled(local_user(), 'forumlist_widget'))) {
if (intval(Feature::isEnabled(local_user(), 'forumlist_widget'))) {
$forum_counts = ForumManager::countUnseenItems();
if (DBM::is_result($forums_counts)) {
foreach ($forums_counts as $forum_count) {


+ 3
- 3
mod/profiles.php View File

@ -674,10 +674,10 @@ function profiles_content(App $a) {
array(t('No'), t('Yes')) //Off - On strings
),
'$multi_profiles' => Features::isEnabled(local_user(), 'multi_profiles'),
'$multi_profiles' => Feature::isEnabled(local_user(), 'multi_profiles'),
'$form_security_token' => get_form_security_token("profile_edit"),
'$form_security_token_photo' => get_form_security_token("profile_photo"),
'$profile_clone_link' => ((Features::isEnabled(local_user(), 'multi_profiles')) ? 'profiles/clone/' . $r[0]['id'] . '?t=' . get_form_security_token("profile_clone") : ""),
'$profile_clone_link' => ((Feature::isEnabled(local_user(), 'multi_profiles')) ? 'profiles/clone/' . $r[0]['id'] . '?t=' . get_form_security_token("profile_clone") : ""),
'$profile_drop_link' => 'profiles/drop/' . $r[0]['id'] . '?t=' . get_form_security_token("profile_drop"),
'$profile_action' => t('Profile Actions'),
@ -755,7 +755,7 @@ function profiles_content(App $a) {
return $o;
} else {
// If we don't support multi profiles, don't display this list.
if (!Features::isEnabled(local_user(), 'multi_profiles')) {
if (!Feature::isEnabled(local_user(), 'multi_profiles')) {
$r = q("SELECT * FROM `profile` WHERE `uid` = %d AND `is-default`=1",
local_user()
);


+ 1
- 1
mod/search.php View File

@ -17,7 +17,7 @@ function search_saved_searches() {
$o = '';
if (! Features::isEnabled(local_user(),'savedsearch'))
if (! Feature::isEnabled(local_user(),'savedsearch'))
return $o;
$r = q("SELECT `id`,`term` FROM `search` WHERE `uid` = %d",


+ 3
- 3
mod/settings.php View File

@ -53,7 +53,7 @@ function settings_init(App $a) {
),
);
if (Features::get()) {
if (Feature::get()) {
$tabs[] = array(
'label' => t('Additional features'),
'url' => 'settings/features',
@ -785,12 +785,12 @@ function settings_content(App $a) {
if (($a->argc > 1) && ($a->argv[1] === 'features')) {
$arr = array();
$features = Features::get();
$features = Feature::get();
foreach ($features as $fname => $fdata) {
$arr[$fname] = array();
$arr[$fname][0] = $fdata[0];
foreach (array_slice($fdata,1) as $f) {
$arr[$fname][1][] = array('feature_' .$f[0], $f[1],((intval(Features::isEnabled(local_user(), $f[0]))) ? "1" : ''), $f[2],array(t('Off'), t('On')));
$arr[$fname][1][] = array('feature_' .$f[0], $f[1],((intval(Feature::isEnabled(local_user(), $f[0]))) ? "1" : ''), $f[2],array(t('Off'), t('On')));
}
}


src/Content/Features.php → src/Content/Feature.php View File

@ -1,6 +1,6 @@
<?php
/**
* @file src/Content/Features.php
* @file src/Content/Feature.php
* @brief Features management
*/
namespace Friendica\Content;
@ -8,7 +8,9 @@ namespace Friendica\Content;
use Friendica\Core\Config;
use Friendica\Core\PConfig;
class Features
require_once 'include/plugin.php';
class Feature
{
/**
* @brief check if feature is enabled
@ -40,7 +42,8 @@ class Features
* @param string $feature
* @return boolean
*/
private static function getDefault($feature) {
private static function getDefault($feature)
{
$f = self::get();
foreach ($f as $cat) {
foreach ($cat as $feat) {
@ -62,8 +65,8 @@ class Features
*
* @return array
*/
public static function get($filtered = true) {
public static function get($filtered = true)
{
$arr = array(
// General
@ -142,7 +145,7 @@ class Features
}
}
call_hooks('get',$arr);
call_hooks('get', $arr);
return $arr;
}
}

+ 2
- 2
src/Content/ForumManager.php View File

@ -83,7 +83,7 @@ class ForumManager
*/
public static function widget($uid, $cid = 0)
{
if (! intval(Features::isEnabled(local_user(), 'forumlist_widget'))) {
if (! intval(Feature::isEnabled(local_user(), 'forumlist_widget'))) {
return;
}
@ -142,7 +142,7 @@ class ForumManager
*/
public static function profileAdvanced($uid)
{
$profile = intval(Features::isEnabled($uid, 'forumlist_profile'));
$profile = intval(Feature::isEnabled($uid, 'forumlist_profile'));
if (! $profile) {
return;
}


+ 8
- 8
src/Object/Item.php View File

@ -162,7 +162,7 @@ class Item extends BaseObject
$drop = array(
'dropping' => $dropping,
'pagedrop' => ((Features::isEnabled($conv->getProfileOwner(), 'multi_delete')) ? $item['pagedrop'] : ''),
'pagedrop' => ((Feature::isEnabled($conv->getProfileOwner(), 'multi_delete')) ? $item['pagedrop'] : ''),
'select' => t('Select'),
'delete' => t('Delete'),
);
@ -280,7 +280,7 @@ class Item extends BaseObject
}
$tagger = '';
if (Features::isEnabled($conv->getProfileOwner(), 'commtag')) {
if (Feature::isEnabled($conv->getProfileOwner(), 'commtag')) {
$tagger = array(
'add' => t("add tag"),
'class' => "",
@ -294,7 +294,7 @@ class Item extends BaseObject
if ($conv->isWritable()) {
$buttons = array(
'like' => array( t("I like this \x28toggle\x29"), t("like")),
'dislike' => ((Features::isEnabled($conv->getProfileOwner(), 'dislike')) ? array( t("I don't like this \x28toggle\x29"), t("dislike")) : ''),
'dislike' => ((Feature::isEnabled($conv->getProfileOwner(), 'dislike')) ? array( t("I don't like this \x28toggle\x29"), t("dislike")) : ''),
);
if ($shareable) {
$buttons['share'] = array( t('Share this'), t('share'));
@ -379,12 +379,12 @@ class Item extends BaseObject
'owner_photo' => $a->remove_baseurl(proxy_url($item['owner-thumb'], false, PROXY_SIZE_THUMB)),
'owner_name' => htmlentities($owner_name_e),
'plink' => get_plink($item),
'edpost' => ((Features::isEnabled($conv->getProfileOwner(), 'edit_posts')) ? $edpost : ''),
'edpost' => ((Feature::isEnabled($conv->getProfileOwner(), 'edit_posts')) ? $edpost : ''),
'isstarred' => $isstarred,
'star' => ((Features::isEnabled($conv->getProfileOwner(), 'star_posts')) ? $star : ''),
'ignore' => ((Features::isEnabled($conv->getProfileOwner(), 'ignore_posts')) ? $ignore : ''),
'star' => ((Feature::isEnabled($conv->getProfileOwner(), 'star_posts')) ? $star : ''),
'ignore' => ((Feature::isEnabled($conv->getProfileOwner(), 'ignore_posts')) ? $ignore : ''),
'tagger' => $tagger,
'filer' => ((Features::isEnabled($conv->getProfileOwner(), 'filing')) ? $filer : ''),
'filer' => ((Feature::isEnabled($conv->getProfileOwner(), 'filing')) ? $filer : ''),
'drop' => $drop,
'vote' => $buttons,
'like' => $responses['like']['output'],
@ -792,7 +792,7 @@ class Item extends BaseObject
'$edimg' => t('Image'),
'$edurl' => t('Link'),
'$edvideo' => t('Video'),
'$preview' => ((Features::isEnabled($conv->getProfileOwner(), 'preview')) ? t('Preview') : ''),
'$preview' => ((Feature::isEnabled($conv->getProfileOwner(), 'preview')) ? t('Preview') : ''),
'$indent' => $indent,
'$sourceapp' => t($a->sourcename),
'$ww' => (($conv->getMode() === 'network') ? $ww : ''),


Loading…
Cancel
Save