Congegni/sintonia
7
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge branch '2.0.x' into devel

Browse source 
Conflicts:
	VERSION
	airtime_mvc/application/models/Systemstatus.php
	install_minimal/include/airtime-constants.php
	install_minimal/include/airtime-upgrade.php
	python_apps/api_clients/api_client.py
	python_apps/media-monitor/install/media-monitor-copy-files.py
	python_apps/media-monitor/install/media-monitor-initialize.py
	python_apps/pypo/install/pypo-initialize.py
	python_apps/pypo/liquidsoap_bin
	python_apps/pypo/pypopush.py
	utils/airtime-log.php
This commit is contained in:
Martin Konecny 2012-04-12 19:08:55 -04:00
commit f96b990275
23 changed files with 121 additions and 30 deletions
Download patch file Download diff file Expand all files Collapse all files

5
utils/airtime-check-system.php
View file

@ -33,8 +33,9 @@ class AirtimeCheck {
public static function ExitIfNotRoot()
{
// Need to check that we are superuser before running this.
$user = exec("whoami");
if($user != "root" && $user != "www-data"){
$euid = posix_geteuid();
$user = posix_getlogin();
if($euid != 0 && $user != "www-data"){
echo "Must be root user.\n";
exit(1);
}