CC-2304: Remove hardcoded paths from scripts in utils/ directory

This commit is contained in:
martin 2011-05-20 15:10:05 -04:00
parent 30b60a03d1
commit acc02ea401
2 changed files with 34 additions and 8 deletions

View File

@ -9,15 +9,28 @@ if (isset($arr["DOCUMENT_ROOT"]) && ($arr["DOCUMENT_ROOT"] != "") ) {
exit(1);
}
set_include_path('/var/www/airtime/library' . PATH_SEPARATOR . get_include_path());
set_include_path('/var/www/airtime/application/models' . PATH_SEPARATOR . get_include_path());
require_once('/var/www/airtime/application/configs/conf.php');
require_once('/var/www/airtime/application/models/StoredFile.php');
$ini = get_ini_file();
$airtime_base_dir = $ini['general']['airtime_dir'];
set_include_path("$airtime_base_dir/library" . PATH_SEPARATOR . get_include_path());
set_include_path("$airtime_base_dir/application/models" . PATH_SEPARATOR . get_include_path());
require_once("$airtime_base_dir/application/configs/conf.php");
require_once("$airtime_base_dir/application/models/StoredFile.php");
require_once('DB.php');
require_once 'propel/runtime/lib/Propel.php';
Propel::init('/var/www/airtime/application/configs/airtime-conf.php');
Propel::init("$airtime_base_dir/application/configs/airtime-conf.php");
function get_ini_file(){
$ini = parse_ini_file("/etc/airtime/airtime.conf", true);
if ($ini === FALSE || !array_key_exists('airtime_dir', $ini['general'])){
echo "Could not open /etc/airtime/airtime.conf. Is Airtime installed?".PHP_EOL;
exit;
}
return $ini;
}
/**
*
* Look through all the files in the database and remove the rows

View File

@ -12,10 +12,13 @@ set_time_limit(0);
error_reporting(E_ALL);
set_error_handler("import_error_handler", E_ALL & !E_NOTICE);
set_include_path('/var/www/airtime/library' . PATH_SEPARATOR . get_include_path());
$ini = get_ini_file();
$airtime_base_dir = $ini['general']['airtime_dir'];
require_once("/var/www/airtime/application/configs/conf.php");
require_once("/var/www/airtime/application/models/StoredFile.php");
set_include_path("$airtime_base_dir/library" . PATH_SEPARATOR . get_include_path());
require_once("$airtime_base_dir/application/configs/conf.php");
require_once("$airtime_base_dir/application/models/StoredFile.php");
require_once('DB.php');
require_once('Console/Getopt.php');
@ -25,6 +28,16 @@ function import_error_handler()
exit();
}
function get_ini_file(){
$ini = parse_ini_file("/etc/airtime/airtime.conf", true);
if ($ini === FALSE || !array_key_exists('airtime_dir', $ini['general'])){
echo "Could not open /etc/airtime/airtime.conf. Is Airtime installed?".PHP_EOL;
exit;
}
return $ini;
}
function printUsage()
{