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

Rework redirect to config page at the end of the web install

Browse source
This commit is contained in:
Duncan Sommerville 2015-01-12 14:40:22 -05:00
parent 23f33cd8da
commit d07195f048
2 changed files with 42 additions and 27 deletions
Download patch file Download diff file Expand all files Collapse all files

66
airtime_mvc/public/setup/setup-functions.php
View file

@ -1,11 +1,12 @@
<?php
define("BUILD_PATH", dirname(dirname( __DIR__)) . "/build/");
define("BUILD_PATH", dirname(dirname(__DIR__)) . "/build/");
define("AIRTIME_CONF_TEMP_PATH", "/tmp/airtime.conf.temp");
/**
* Class Setup
*
* @author sourcefabric
*
* Abstract superclass for the setup and installation process
*/
abstract class Setup {
@ -14,23 +15,31 @@ abstract class Setup {
abstract function runSetup();
/**
* Write new property values to a given section in airtime.conf.temp
*
* @param string $section
* the configuration section to write to
* @param array $properties
* the configuration properties and values to overwrite
*/
protected function writeToTemp($section, $properties) {
if (!file_exists(AIRTIME_CONF_TEMP_PATH)) {
copy(BUILD_PATH . "airtime.example.conf", AIRTIME_CONF_TEMP_PATH);
}
$file = file(AIRTIME_CONF_TEMP_PATH);
$fileOutput = "";
$inSection = false;
foreach($file as $line) {
if(strpos($line, $section) !== false) {
foreach ($file as $line) {
if (strpos($line, $section) !== false) {
$inSection = true;
} else if (strpos($line, "[") !== false) {
$inSection = false;
}
if ($inSection) {
$key = trim(@substr($line, 0, strpos($line, "=")));
$fileOutput .= $key && isset($properties[$key]) ? $key . " = " . $properties[$key] . "\n" : $line;
@ -38,22 +47,23 @@ abstract class Setup {
$fileOutput .= $line;
}
}
file_put_contents(AIRTIME_CONF_TEMP_PATH, $fileOutput);
}
/**
* Generates a random string.
*
* @param integer $p_len length of the output string
* @param string $p_chars characters to use in the output string
* @param integer $p_len
* length of the output string
* @param string $p_chars
* characters to use in the output string
* @return string the generated random string
*/
protected function generateRandomString($p_len=20, $p_chars = 'ABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789') {
protected function generateRandomString($p_len = 20, $p_chars = 'ABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789') {
$string = '';
for ($i = 0; $i < $p_len; $i++)
{
$pos = mt_rand(0, strlen($p_chars)-1);
for($i = 0; $i < $p_len; $i++) {
$pos = mt_rand(0, strlen($p_chars) - 1);
$string .= $p_chars{$pos};
}
return $string;
@ -61,8 +71,15 @@ abstract class Setup {
}
/**
* Class AirtimeDatabaseException
*
* @author sourcefabric
*
* Exception class for database setup errors
*/
class AirtimeDatabaseException extends Exception {
protected $message = "Unknown Airtime database exception";
protected $errors = array();
@ -78,11 +95,10 @@ class AirtimeDatabaseException extends Exception {
}
// Import Setup subclasses
require_once('database-setup.php');
require_once('rabbitmq-setup.php');
require_once('general-setup.php');
require_once('media-setup.php');
require_once ('database-setup.php');
require_once ('rabbitmq-setup.php');
require_once ('general-setup.php');
require_once ('media-setup.php');
// If airtime.conf exists, we shouldn't be here
if (!file_exists("/etc/airtime/airtime.conf")) {
@ -91,13 +107,13 @@ if (!file_exists("/etc/airtime/airtime.conf")) {
if ($obj instanceof Setup) {
try {
$response = $obj->runSetup();
} catch(AirtimeDatabaseException $e) {
} catch (AirtimeDatabaseException $e) {
$response = array(
"message" => $e->getMessage(),
"errors" => $e->getErrorFields(),
"message" => $e->getMessage(),
"errors" => $e->getErrorFields()
);
}
echo json_encode($response);
}
}