From 61df7c1a4486a452656c8cc4f4ec54a63b9045fc Mon Sep 17 00:00:00 2001 From: drigato Date: Fri, 25 Apr 2014 14:20:04 -0400 Subject: [PATCH] Moved some comments around --- airtime_mvc/application/controllers/UpgradeController.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/airtime_mvc/application/controllers/UpgradeController.php b/airtime_mvc/application/controllers/UpgradeController.php index 78a4126e8..b7d89170e 100644 --- a/airtime_mvc/application/controllers/UpgradeController.php +++ b/airtime_mvc/application/controllers/UpgradeController.php @@ -42,9 +42,9 @@ class UpgradeController extends Zend_Controller_Action Application_Model_Preference::setDiskUsage($totalSpace - $freeSpace); + //update application.ini $iniFile = isset($_SERVER['AIRTIME_BASE']) ? $_SERVER['AIRTIME_BASE']."application.ini" : "/usr/share/airtime/application/configs/application.ini"; - //update application.ini $newLines = "resources.frontController.moduleDirectory = APPLICATION_PATH \"/modules\"\n". "resources.frontController.plugins.putHandler = \"Zend_Controller_Plugin_PutHandler\"\n". ";load everything in the modules directory including models\n". @@ -79,10 +79,10 @@ class UpgradeController extends Zend_Controller_Action $con->commit(); + //update system_version in cc_pref and change some columns in cc_files $airtimeConf = isset($_SERVER['AIRTIME_CONF']) ? $_SERVER['AIRTIME_CONF'] : "/etc/airtime/airtime.conf"; $values = parse_ini_file($airtimeConf, true); - //update system_version in cc_pref and change some columns in cc_files $username = $values['database']['dbuser']; $password = $values['database']['dbpass']; $host = $values['database']['host'];