diff --git a/boot.php b/boot.php index 2863c1b97..9e0d8e061 100644 --- a/boot.php +++ b/boot.php @@ -1493,7 +1493,7 @@ if(! function_exists('proc_run')) { $cmdline = implode($args," "); if(get_config('system','proc_windows')) - proc_close(proc_open('start /b ' . $cmdline,array(),$foo)); + proc_close(proc_open('cmd /c start /b ' . $cmdline,array(),$foo)); else proc_close(proc_open($cmdline." &",array(),$foo)); } diff --git a/mod/install.php b/mod/install.php index 4e4631b85..eff408964 100755 --- a/mod/install.php +++ b/mod/install.php @@ -114,7 +114,7 @@ function install_content(&$a) { global $install_wizard_pass, $db; $o = ''; $wizard_status = ""; - $install_title = t('Friendica Social Communications Server - Setup'); + $install_title = t('Friendica Red Communications Server - Setup'); @@ -233,6 +233,7 @@ function install_content(&$a) { '$dbuser' => array('dbuser', t('Database Login Name'), $dbuser, ''), '$dbpass' => array('dbpass', t('Database Login Password'), $dbpass, ''), '$dbdata' => array('dbdata', t('Database Name'), $dbdata, ''), + '$adminmail' => array('adminmail', t('Site administrator email address'), $adminmail, t('Your account email address must match this in order to use the web admin panel.')), @@ -387,7 +388,7 @@ function check_funcs(&$checks) { $ck_funcs[0]['status']= false; $ck_funcs[0]['help']= t('Error: libCURL PHP module required but not installed.'); } - if(! function_exists('imagecreatefromjpeg')){ +x if(! function_exists('imagecreatefromjpeg')){ $ck_funcs[1]['status']= false; $ck_funcs[1]['help']= t('Error: GD graphics PHP module with JPEG support required but not installed.'); } @@ -406,8 +407,7 @@ function check_funcs(&$checks) { $checks = array_merge($checks, $ck_funcs); - /*if((x($_SESSION,'sysmsg')) && is_array($_SESSION['sysmsg']) && count($_SESSION['sysmsg'])) - notice( t('Please see the file "INSTALL.txt".') . EOL);*/ + } @@ -488,7 +488,7 @@ function what_next() { ."
".t('IMPORTANT: You will need to [manually] setup a scheduled task for the poller.') .t('Please see the file "INSTALL.txt".') ."
" - .t("Go to your new Firendica node registration page and register as new user. Remember to use the same email you have entered as administrator email. This will allow you to enter the site admin panel.") + .t("Go to your new Friendica node registration page and register as new user. Remember to use the same email you have entered as administrator email. This will allow you to enter the site admin panel.") ."
"; } diff --git a/mod/manage.php b/mod/manage.php index 96d420c78..e0e99b123 100644 --- a/mod/manage.php +++ b/mod/manage.php @@ -82,32 +82,29 @@ function manage_post(&$a) { function manage_content(&$a) { - if(! local_user()) { + if(! get_account_id()) { notice( t('Permission denied.') . EOL); return; } - $o = '