Fix formatting in mod/delegate

- Remove parentheses from language construct
- Add missing braces
- Use dba::* when possible
- Capitalize SQL queries keywords
- Use new array syntax
This commit is contained in:
Hypolite Petovan 2018-01-12 23:29:49 -05:00
parent f588adb511
commit e3b69f97cf

View file

@ -4,130 +4,118 @@ use Friendica\App;
use Friendica\Core\System; use Friendica\Core\System;
use Friendica\Database\DBM; use Friendica\Database\DBM;
require_once('mod/settings.php'); require_once 'mod/settings.php';
function delegate_init(App $a) { function delegate_init(App $a)
{
return settings_init($a); return settings_init($a);
} }
function delegate_content(App $a) { function delegate_content(App $a)
{
if (! local_user()) { if (!local_user()) {
notice( t('Permission denied.') . EOL); notice(t('Permission denied.') . EOL);
return; return;
} }
if ($a->argc > 2 && $a->argv[1] === 'add' && intval($a->argv[2])) { if ($a->argc > 2 && $a->argv[1] === 'add' && intval($a->argv[2])) {
// delegated admins can view but not change delegation permissions // delegated admins can view but not change delegation permissions
if (x($_SESSION, 'submanage')) {
if (x($_SESSION,'submanage') && intval($_SESSION['submanage'])) {
goaway(System::baseUrl() . '/delegate'); goaway(System::baseUrl() . '/delegate');
} }
$id = $a->argv[2]; $user_id = $a->argv[2];
$r = q("select `nickname` from user where uid = %d limit 1", $user = dba::selectFirst('user', ['nickname'], ['uid' => $user_id]);
intval($id) if (DBM::is_result($user)) {
); $condition = [
if (DBM::is_result($r)) { 'uid' => local_user(),
$r = q("select id from contact where uid = %d and nurl = '%s' limit 1", 'nurl' => normalise_link(System::baseUrl() . '/profile/' . $user['nickname'])
intval(local_user()), ];
dbesc(normalise_link(System::baseUrl() . '/profile/' . $r[0]['nickname'])) if (dba::exists('contact', $condition)) {
); dba::insert('manage', ['uid' => $user_id, 'mid' => local_user()]);
if (DBM::is_result($r)) {
dba::insert('manage', array('uid' => $a->argv[2], 'mid' => local_user()));
} }
} }
goaway(System::baseUrl() . '/delegate'); goaway(System::baseUrl() . '/delegate');
} }
if ($a->argc > 2 && $a->argv[1] === 'remove' && intval($a->argv[2])) { if ($a->argc > 2 && $a->argv[1] === 'remove' && intval($a->argv[2])) {
// delegated admins can view but not change delegation permissions // delegated admins can view but not change delegation permissions
if (x($_SESSION,'submanage') && intval($_SESSION['submanage'])) { if (x($_SESSION, 'submanage')) {
goaway(System::baseUrl() . '/delegate'); goaway(System::baseUrl() . '/delegate');
} }
q("DELETE FROM `manage` WHERE `uid` = %d AND `mid` = %d LIMIT 1", dba::delete('manage', ['uid' => $a->argv[2], 'mid' => local_user()]);
intval($a->argv[2]),
intval(local_user())
);
goaway(System::baseUrl() . '/delegate'); goaway(System::baseUrl() . '/delegate');
} }
$full_managers = array();
// These people can manage this account/page with full privilege // These people can manage this account/page with full privilege
$full_managers = [];
$r = q("SELECT * FROM `user` WHERE `email` = '%s' AND `password` = '%s' ", $r = q("SELECT * FROM `user` WHERE `email` = '%s' AND `password` = '%s' ",
dbesc($a->user['email']), dbesc($a->user['email']),
dbesc($a->user['password']) dbesc($a->user['password'])
); );
if (DBM::is_result($r)) if (DBM::is_result($r)) {
$full_managers = $r; $full_managers = $r;
}
$delegates = array();
// find everybody that currently has delegated management to this account/page // find everybody that currently has delegated management to this account/page
$delegates = [];
$r = q("select * from user where uid in ( select uid from manage where mid = %d ) ", $r = q("SELECT * FROM `user` WHERE `uid` IN (SELECT `uid` FROM `manage` WHERE `mid` = %d)",
intval(local_user()) intval(local_user())
); );
if (DBM::is_result($r)) {
if (DBM::is_result($r))
$delegates = $r; $delegates = $r;
}
$uids = array(); $uids = [];
foreach ($full_managers as $rr) {
$uids[] = $rr['uid'];
}
if(count($full_managers)) foreach ($delegates as $rr) {
foreach($full_managers as $rr) $uids[] = $rr['uid'];
$uids[] = $rr['uid']; }
if(count($delegates))
foreach($delegates as $rr)
$uids[] = $rr['uid'];
// find every contact who might be a candidate for delegation // find every contact who might be a candidate for delegation
$r = q("select nurl from contact where substring_index(contact.nurl,'/',3) = '%s' $r = q("SELECT `nurl`
and contact.uid = %d and contact.self = 0 and network = '%s' ", FROM `contact`
WHERE `self` = 0
AND SUBSTRING_INDEX(`nurl`, '/', 3) = '%s'
AND `uid` = %d
AND `network` = '%s' ",
dbesc(normalise_link(System::baseUrl())), dbesc(normalise_link(System::baseUrl())),
intval(local_user()), intval(local_user()),
dbesc(NETWORK_DFRN) dbesc(NETWORK_DFRN)
); );
if (!DBM::is_result($r)) {
if (! DBM::is_result($r)) { notice(t('No potential page delegates located.') . EOL);
notice( t('No potential page delegates located.') . EOL);
return; return;
} }
$nicknames = array(); $nicknames = [];
foreach ($r as $rr) {
$nicknames[] = "'" . dbesc(basename($rr['nurl'])) . "'";
}
$potentials = [];
$nicks = implode(',', $nicknames);
// get user records for all potential page delegates who are not already delegates or managers
$r = q("SELECT `uid`, `username`, `nickname` FROM `user` WHERE `nickname` IN ($nicks)");
if (DBM::is_result($r)) { if (DBM::is_result($r)) {
foreach ($r as $rr) { foreach ($r as $rr) {
$nicknames[] = "'" . dbesc(basename($rr['nurl'])) . "'"; if (!in_array($rr['uid'], $uids)) {
$potentials[] = $rr;
}
} }
} }
$potentials = array();
$nicks = implode(',',$nicknames);
// get user records for all potential page delegates who are not already delegates or managers
$r = q("select `uid`, `username`, `nickname` from user where nickname in ( $nicks )");
if (DBM::is_result($r))
foreach($r as $rr)
if(! in_array($rr['uid'],$uids))
$potentials[] = $rr;
require_once("mod/settings.php");
settings_init($a); settings_init($a);
$o = replace_macros(get_markup_template('delegate.tpl'),array( $o = replace_macros(get_markup_template('delegate.tpl'), [
'$header' => t('Delegate Page Management'), '$header' => t('Delegate Page Management'),
'$base' => System::baseUrl(), '$base' => System::baseUrl(),
'$desc' => t('Delegates are able to manage all aspects of this account/page except for basic account settings. Please do not delegate your personal account to anybody that you do not trust completely.'), '$desc' => t('Delegates are able to manage all aspects of this account/page except for basic account settings. Please do not delegate your personal account to anybody that you do not trust completely.'),
@ -140,10 +128,8 @@ function delegate_content(App $a) {
'$remove' => t('Remove'), '$remove' => t('Remove'),
'$add' => t('Add'), '$add' => t('Add'),
'$none' => t('No entries.') '$none' => t('No entries.')
)); ]);
return $o; return $o;
} }