X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=mod%2Fdelegate.php;h=4bccf1142ae0884f61285207e960e3ce9c5cf804;hb=d0dfcc71a82ac423db68a12fd2eaf6d13cb18e1f;hp=0ba5dd39c1e53d36eda5f35caf4079aa0bfcdff0;hpb=abff6372ddd09be7750b5f1af5a1f889cfeb9635;p=friendica.git diff --git a/mod/delegate.php b/mod/delegate.php index 0ba5dd39c1..4bccf1142a 100644 --- a/mod/delegate.php +++ b/mod/delegate.php @@ -1,25 +1,28 @@ 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 - if(x($_SESSION,'submanage') && intval($_SESSION['submanage'])) - goaway(App::get_baseurl() . '/delegate'); - + if (x($_SESSION,'submanage') && intval($_SESSION['submanage'])) { + goaway(System::baseUrl() . '/delegate'); + } $id = $a->argv[2]; @@ -29,30 +32,27 @@ function delegate_content(&$a) { if (dbm::is_result($r)) { $r = q("select id from contact where uid = %d and nurl = '%s' limit 1", intval(local_user()), - dbesc(normalise_link(App::get_baseurl() . '/profile/' . $r[0]['nickname'])) + dbesc(normalise_link(System::baseUrl() . '/profile/' . $r[0]['nickname'])) ); if (dbm::is_result($r)) { - q("insert into manage ( uid, mid ) values ( %d , %d ) ", - intval($a->argv[2]), - intval(local_user()) - ); + dba::insert('manage', array('uid' => $a->argv[2], 'mid' => local_user())); } } - goaway(App::get_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 + if (x($_SESSION,'submanage') && intval($_SESSION['submanage'])) { + goaway(System::baseUrl() . '/delegate'); + } - if(x($_SESSION,'submanage') && intval($_SESSION['submanage'])) - goaway(App::get_baseurl() . '/delegate'); - - q("delete from manage where uid = %d and mid = %d limit 1", + q("DELETE FROM `manage` WHERE `uid` = %d AND `mid` = %d LIMIT 1", intval($a->argv[2]), intval(local_user()) ); - goaway(App::get_baseurl() . '/delegate'); + goaway(System::baseUrl() . '/delegate'); } @@ -90,12 +90,12 @@ function delegate_content(&$a) { // 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 from contact where substring_index(contact.nurl,'/',3) = '%s' and contact.uid = %d and contact.self = 0 and network = '%s' ", - dbesc(normalise_link(App::get_baseurl())), + dbesc(normalise_link(System::baseUrl())), intval(local_user()), dbesc(NETWORK_DFRN) - ); + ); if (! dbm::is_result($r)) { notice( t('No potential page delegates located.') . EOL); @@ -105,7 +105,7 @@ function delegate_content(&$a) { $nicknames = array(); if (dbm::is_result($r)) { - foreach($r as $rr) { + foreach ($r as $rr) { $nicknames[] = "'" . dbesc(basename($rr['nurl'])) . "'"; } } @@ -128,7 +128,7 @@ function delegate_content(&$a) { $o = replace_macros(get_markup_template('delegate.tpl'),array( '$header' => t('Delegate Page Management'), - '$base' => App::get_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.'), '$head_managers' => t('Existing Page Managers'), '$managers' => $full_managers,