From baed7d339ee0d5139fe1c93691a4225796e7e08c Mon Sep 17 00:00:00 2001 From: redmatrix Date: Sun, 24 Jan 2016 15:20:25 -0800 Subject: make exec the default for proc_run - use system.use_proc_open to use proc_open. Also prohibit delegated channels from manually invoking new_channel under the delegated account. --- boot.php | 6 +++--- mod/new_channel.php | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/boot.php b/boot.php index d6c02ecc0..b80b76a8a 100755 --- a/boot.php +++ b/boot.php @@ -1728,10 +1728,10 @@ function proc_run($cmd){ proc_close(proc_open($cmd, array(), $foo)); } else { - if(get_config('system','proc_run_use_exec')) - exec($cmdline . ' > /dev/null &'); - else + if(get_config('system','use_proc_open')) proc_close(proc_open($cmdline ." &", array(), $foo)); + else + exec($cmdline . ' > /dev/null &'); } } diff --git a/mod/new_channel.php b/mod/new_channel.php index bec2a3c09..0429bbee7 100644 --- a/mod/new_channel.php +++ b/mod/new_channel.php @@ -64,7 +64,7 @@ function new_channel_post(&$a) { $arr = $_POST; - if(($arr['account_id'] = get_account_id()) === false) { + if((! $a->get_account()) || ($arr['account_id'] = get_account_id()) === false) { notice( t('Permission denied.') . EOL ); return; } @@ -95,7 +95,7 @@ function new_channel_post(&$a) { function new_channel_content(&$a) { - if(! get_account_id()) { + if(! $a->get_account()) { notice( t('Permission denied.') . EOL); return; } -- cgit v1.2.3