Merge branch 'cc-5709-airtime-analyzer' into cc-5709-airtime-analyzer-saas
Conflicts: airtime_mvc/application/controllers/UpgradeController.php
This commit is contained in:
commit
1de58c64d6
|
@ -24,7 +24,8 @@ class UpgradeController extends Zend_Controller_Action
|
||||||
//create a temporary maintenance notification file
|
//create a temporary maintenance notification file
|
||||||
//when this file is on the server, zend framework redirects all
|
//when this file is on the server, zend framework redirects all
|
||||||
//requests to the maintenance page and sets a 503 response code
|
//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');
|
$file = fopen($maintenanceFile, 'w');
|
||||||
fclose($file);
|
fclose($file);
|
||||||
|
|
||||||
|
|
|
@ -2,10 +2,10 @@
|
||||||
|
|
||||||
class Zend_Controller_Plugin_Maintenance extends Zend_Controller_Plugin_Abstract
|
class Zend_Controller_Plugin_Maintenance extends Zend_Controller_Plugin_Abstract
|
||||||
{
|
{
|
||||||
protected $maintenanceFile = '/tmp/maintenance.txt';
|
|
||||||
|
|
||||||
public function preDispatch(Zend_Controller_Request_Abstract $request) {
|
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')
|
$request->setModuleName('default')
|
||||||
->setControllerName('index')
|
->setControllerName('index')
|
||||||
->setActionName('maintenance')
|
->setActionName('maintenance')
|
||||||
|
|
Loading…
Reference in New Issue