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

Merge branch 'cc-5709-airtime-analyzer' into cc-5709-airtime-analyzer-saas 

Conflicts:
	airtime_mvc/application/controllers/UpgradeController.php
This commit is contained in:
drigato 2014-04-28 09:44:14 -04:00
parent 2fdb8d1deb 42806b1cbf
commit 1de58c64d6
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
airtime_mvc/application/controllers/UpgradeController.php
View File

@ -24,7 +24,8 @@ class UpgradeController extends Zend_Controller_Action
//create a temporary maintenance notification file
//when this file is on the server, zend framework redirects all
//requests to the maintenance page and sets a 503 response code
$maintenanceFile = $_SERVER['AIRTIME_BASE']."maintenance.txt";
$maintenanceFile = isset($_SERVER['AIRTIME_BASE']) ? $_SERVER['AIRTIME_BASE']."maintenance.txt" : "/tmp/maintenance.txt";
$file = fopen($maintenanceFile, 'w');
fclose($file);

6
airtime_mvc/application/controllers/plugins/Maintenance.php
View File

@ -2,10 +2,10 @@
class Zend_Controller_Plugin_Maintenance extends Zend_Controller_Plugin_Abstract
{
protected $maintenanceFile = '/tmp/maintenance.txt';
public function preDispatch(Zend_Controller_Request_Abstract $request) {
if (file_exists($this->maintenanceFile)) {
$maintenanceFile = isset($_SERVER['AIRTIME_BASE']) ? $_SERVER['AIRTIME_BASE']."maintenance.txt" : "/tmp/maintenance.txt";
if (file_exists($maintenanceFile)) {
$request->setModuleName('default')
->setControllerName('index')
->setActionName('maintenance')