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

Moved function ExitIFNotRoot() to AirtimeInstall.php instead of AirtimeIni.php.

This commit is contained in:
Paul Baranowski 2011-04-12 13:59:08 -04:00
parent 0177bc1a06
commit f23cfb489c
4 changed files with 20 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
install/airtime-install.php
View File

@ -8,13 +8,13 @@
echo "******************************** Install Begin *********************************".PHP_EOL;
require_once(dirname(__FILE__).'/include/AirtimeIni.php');
require_once(dirname(__FILE__).'/include/AirtimeInstall.php');
AirtimeIni::ExitIfNotRoot();
AirtimeInstall::ExitIfNotRoot();
AirtimeIni::CreateIniFile();
AirtimeIni::UpdateIniFiles();
require_once(dirname(__FILE__).'/../application/configs/conf.php');
require_once(dirname(__FILE__).'/include/AirtimeInstall.php');
echo PHP_EOL."*** Installing Airtime ".AIRTIME_VERSION." ***".PHP_EOL;

4
install/airtime-uninstall.php
View File

@ -6,8 +6,9 @@
*/
require_once(dirname(__FILE__).'/include/AirtimeIni.php');
require_once(dirname(__FILE__).'/include/AirtimeInstall.php');
// Need to check that we are superuser before running this.
AirtimeIni::ExitIfNotRoot();
AirtimeInstall::ExitIfNotRoot();
if (!file_exists('/etc/airtime/airtime.conf')) {
echo PHP_EOL."Airtime config file '/etc/airtime/airtime.conf' does not exist.".PHP_EOL;
@ -15,7 +16,6 @@ if (!file_exists('/etc/airtime/airtime.conf')) {
exit();
}
require_once(dirname(__FILE__).'/../application/configs/conf.php');
require_once(dirname(__FILE__).'/include/AirtimeInstall.php');
AirtimeInstall::RemoveSymlinks();

18
install/include/AirtimeIni.php
View File

@ -35,7 +35,7 @@ class AirtimeIni{
exit(1);
}
}
if (!copy(__DIR__."/../../build/airtime.conf", "/etc/airtime/airtime.conf")){
echo "Could not copy airtime.conf to /etc/airtime/. Exiting.";
exit(1);
@ -81,20 +81,6 @@ class AirtimeIni{
}
}
/**
* Ensures that the user is running this PHP script with root
* permissions. If not running with root permissions, causes the
* script to exit.
*/
static function ExitIfNotRoot()
{
// Need to check that we are superuser before running this.
if(exec("whoami") != "root"){
echo "Must be root user.\n";
exit(1);
}
}
/**
* This function generates a random string.
*
@ -132,7 +118,7 @@ class AirtimeIni{
* The property to look for in order to change its value.
* @param string $p_value
* The value the property should be changed to.
*
*
*/
static function UpdateIniValue($p_filename, $p_property, $p_value)
{

14
install/include/AirtimeInstall.php
View File

@ -4,6 +4,20 @@ require_once(dirname(__FILE__).'/../../library/pear/DB.php');
require_once(dirname(__FILE__).'/../../application/configs/conf.php');
class AirtimeInstall {
/**
* Ensures that the user is running this PHP script with root
* permissions. If not running with root permissions, causes the
* script to exit.
*/
static function ExitIfNotRoot()
{
// Need to check that we are superuser before running this.
if(exec("whoami") != "root"){
echo "Must be root user.\n";
exit(1);
}
}
static function DbTableExists($p_name)
{