Remove references to include/acl_selectors
This commit is contained in:
parent
207eac4a16
commit
09c717d751
|
@ -21,8 +21,6 @@ use Friendica\Util\DateTimeFormat;
|
||||||
use Friendica\Util\Temporal;
|
use Friendica\Util\Temporal;
|
||||||
use Friendica\Util\XML;
|
use Friendica\Util\XML;
|
||||||
|
|
||||||
require_once "include/acl_selectors.php";
|
|
||||||
|
|
||||||
function item_extract_images($body) {
|
function item_extract_images($body) {
|
||||||
|
|
||||||
$saved_image = [];
|
$saved_image = [];
|
||||||
|
|
|
@ -9,7 +9,6 @@ use Friendica\Core\Addon;
|
||||||
use Friendica\Database\DBM;
|
use Friendica\Database\DBM;
|
||||||
use Friendica\Model\Contact;
|
use Friendica\Model\Contact;
|
||||||
|
|
||||||
require_once 'include/acl_selectors.php';
|
|
||||||
require_once 'include/dba.php';
|
require_once 'include/dba.php';
|
||||||
require_once 'mod/proxy.php';
|
require_once 'mod/proxy.php';
|
||||||
|
|
||||||
|
|
|
@ -205,7 +205,6 @@ function display_content(App $a, $update = false, $update_uid = 0) {
|
||||||
|
|
||||||
require_once 'include/security.php';
|
require_once 'include/security.php';
|
||||||
require_once 'include/conversation.php';
|
require_once 'include/conversation.php';
|
||||||
require_once 'include/acl_selectors.php';
|
|
||||||
|
|
||||||
$o = '';
|
$o = '';
|
||||||
|
|
||||||
|
|
|
@ -10,8 +10,6 @@ use Friendica\Core\L10n;
|
||||||
use Friendica\Core\System;
|
use Friendica\Core\System;
|
||||||
use Friendica\Database\DBM;
|
use Friendica\Database\DBM;
|
||||||
|
|
||||||
require_once 'include/acl_selectors.php';
|
|
||||||
|
|
||||||
function editpost_content(App $a) {
|
function editpost_content(App $a) {
|
||||||
|
|
||||||
$o = '';
|
$o = '';
|
||||||
|
|
|
@ -479,8 +479,6 @@ function events_content(App $a) {
|
||||||
$fhour = ((x($orig_event)) ? DateTimeFormat::convert($fdt, $tz, 'UTC', 'H') : '00');
|
$fhour = ((x($orig_event)) ? DateTimeFormat::convert($fdt, $tz, 'UTC', 'H') : '00');
|
||||||
$fminute = ((x($orig_event)) ? DateTimeFormat::convert($fdt, $tz, 'UTC', 'i') : '00');
|
$fminute = ((x($orig_event)) ? DateTimeFormat::convert($fdt, $tz, 'UTC', 'i') : '00');
|
||||||
|
|
||||||
require_once 'include/acl_selectors.php' ;
|
|
||||||
|
|
||||||
$perms = Acl::getDefaultUserPermissions($orig_event);
|
$perms = Acl::getDefaultUserPermissions($orig_event);
|
||||||
|
|
||||||
if ($mode === 'new' || $mode === 'copy') {
|
if ($mode === 'new' || $mode === 'copy') {
|
||||||
|
|
|
@ -76,8 +76,6 @@ function fsuggest_post(App $a)
|
||||||
|
|
||||||
function fsuggest_content(App $a)
|
function fsuggest_content(App $a)
|
||||||
{
|
{
|
||||||
require_once 'include/acl_selectors.php';
|
|
||||||
|
|
||||||
if (! local_user()) {
|
if (! local_user()) {
|
||||||
notice(L10n::t('Permission denied.') . EOL);
|
notice(L10n::t('Permission denied.') . EOL);
|
||||||
return;
|
return;
|
||||||
|
|
|
@ -146,7 +146,6 @@ function group_content(App $a) {
|
||||||
}
|
}
|
||||||
|
|
||||||
if (($a->argc > 1) && (intval($a->argv[1]))) {
|
if (($a->argc > 1) && (intval($a->argv[1]))) {
|
||||||
require_once 'include/acl_selectors.php';
|
|
||||||
require_once 'mod/contacts.php';
|
require_once 'mod/contacts.php';
|
||||||
|
|
||||||
$r = q("SELECT * FROM `group` WHERE `id` = %d AND `uid` = %d AND `deleted` = 0 LIMIT 1",
|
$r = q("SELECT * FROM `group` WHERE `id` = %d AND `uid` = %d AND `deleted` = 0 LIMIT 1",
|
||||||
|
|
|
@ -16,7 +16,6 @@ use Friendica\Model\Mail;
|
||||||
use Friendica\Util\DateTimeFormat;
|
use Friendica\Util\DateTimeFormat;
|
||||||
use Friendica\Util\Temporal;
|
use Friendica\Util\Temporal;
|
||||||
|
|
||||||
require_once 'include/acl_selectors.php';
|
|
||||||
require_once 'include/conversation.php';
|
require_once 'include/conversation.php';
|
||||||
|
|
||||||
function message_init(App $a)
|
function message_init(App $a)
|
||||||
|
|
|
@ -25,7 +25,6 @@ use Friendica\Util\DateTimeFormat;
|
||||||
|
|
||||||
require_once 'include/conversation.php';
|
require_once 'include/conversation.php';
|
||||||
require_once 'include/items.php';
|
require_once 'include/items.php';
|
||||||
require_once 'include/acl_selectors.php';
|
|
||||||
|
|
||||||
function network_init(App $a)
|
function network_init(App $a)
|
||||||
{
|
{
|
||||||
|
|
|
@ -33,7 +33,6 @@ function notes_content(App $a, $update = false)
|
||||||
|
|
||||||
require_once 'include/security.php';
|
require_once 'include/security.php';
|
||||||
require_once 'include/conversation.php';
|
require_once 'include/conversation.php';
|
||||||
require_once 'include/acl_selectors.php';
|
|
||||||
$groups = [];
|
$groups = [];
|
||||||
|
|
||||||
|
|
||||||
|
|
|
@ -27,7 +27,6 @@ use Friendica\Util\Map;
|
||||||
use Friendica\Util\Temporal;
|
use Friendica\Util\Temporal;
|
||||||
|
|
||||||
require_once 'include/items.php';
|
require_once 'include/items.php';
|
||||||
require_once 'include/acl_selectors.php';
|
|
||||||
require_once 'include/security.php';
|
require_once 'include/security.php';
|
||||||
|
|
||||||
function photos_init(App $a) {
|
function photos_init(App $a) {
|
||||||
|
|
|
@ -119,7 +119,6 @@ function profile_content(App $a, $update = 0)
|
||||||
|
|
||||||
require_once 'include/security.php';
|
require_once 'include/security.php';
|
||||||
require_once 'include/conversation.php';
|
require_once 'include/conversation.php';
|
||||||
require_once 'include/acl_selectors.php';
|
|
||||||
require_once 'include/items.php';
|
require_once 'include/items.php';
|
||||||
|
|
||||||
$groups = [];
|
$groups = [];
|
||||||
|
|
|
@ -1000,8 +1000,6 @@ function settings_content(App $a)
|
||||||
* ACCOUNT SETTINGS
|
* ACCOUNT SETTINGS
|
||||||
*/
|
*/
|
||||||
|
|
||||||
require_once('include/acl_selectors.php');
|
|
||||||
|
|
||||||
$profile = dba::selectFirst('profile', [], ['is-default' => true, 'uid' => local_user()]);
|
$profile = dba::selectFirst('profile', [], ['is-default' => true, 'uid' => local_user()]);
|
||||||
if (!DBM::is_result($profile)) {
|
if (!DBM::is_result($profile)) {
|
||||||
notice(L10n::t('Unable to find your profile. Please contact your admin.') . EOL);
|
notice(L10n::t('Unable to find your profile. Please contact your admin.') . EOL);
|
||||||
|
|
|
@ -19,7 +19,6 @@ use Friendica\Protocol\DFRN;
|
||||||
use Friendica\Util\DateTimeFormat;
|
use Friendica\Util\DateTimeFormat;
|
||||||
|
|
||||||
require_once 'include/items.php';
|
require_once 'include/items.php';
|
||||||
require_once 'include/acl_selectors.php';
|
|
||||||
require_once 'include/security.php';
|
require_once 'include/security.php';
|
||||||
|
|
||||||
function videos_init(App $a) {
|
function videos_init(App $a) {
|
||||||
|
|
|
@ -289,7 +289,6 @@ class Group extends BaseObject
|
||||||
}
|
}
|
||||||
|
|
||||||
if ($check_dead && !$use_gcontact) {
|
if ($check_dead && !$use_gcontact) {
|
||||||
require_once 'include/acl_selectors.php';
|
|
||||||
Contact::pruneUnavailable($return);
|
Contact::pruneUnavailable($return);
|
||||||
}
|
}
|
||||||
return $return;
|
return $return;
|
||||||
|
|
Loading…
Reference in a new issue