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

Merge branch 'saas-showbuilder' of github.com:sourcefabric/Airtime into saas-showbuilder

Browse source
This commit is contained in:
Albert Santoni 2015-08-27 19:04:18 -04:00
commit 099fc0107e
17 changed files with 496 additions and 391 deletions
Download patch file Download diff file Expand all files Collapse all files

6
airtime_mvc/application/controllers/LoginController.php
View file

@ -28,7 +28,7 @@ class LoginController extends Zend_Controller_Action
$auth = Zend_Auth::getInstance();
if ($auth->hasIdentity()) {
$this->_redirect('Showbuilder');
$this->_redirect('showbuilder');
}
//uses separate layout without a navigation.
@ -76,7 +76,7 @@ class LoginController extends Zend_Controller_Action
//set the user locale in case user changed it in when logging in
Application_Model_Preference::SetUserLocale($locale);
$this->_redirect('Showbuilder');
$this->_redirect('showbuilder');
} else {
$email = $form->getValue('username');
$authAdapter = new WHMCS_Auth_Adapter("admin", $email, $password);
@ -87,7 +87,7 @@ class LoginController extends Zend_Controller_Action
//set the user locale in case user changed it in when logging in
Application_Model_Preference::SetUserLocale($locale);
$this->_redirect('Showbuilder');
$this->_redirect('showbuilder');
}
else {
$message = _("Wrong username or password provided. Please try again.");

4
airtime_mvc/application/controllers/SetupController.php
View file

@ -34,10 +34,10 @@ class SetupController extends Zend_Controller_Action
Application_Model_Preference::setLangTimezoneSetupComplete(true);
$this->_redirect('/Showbuilder');
$this->_redirect('/showbuilder');
}
}
$this->_redirect('/Showbuilder');
$this->_redirect('/showbuilder');
}
}

4
airtime_mvc/application/controllers/WhmcsLoginController.php
View file

@ -22,7 +22,7 @@ class WhmcsLoginController extends Zend_Controller_Action
Application_Model_Locale::configureLocalization($request->getcookie('airtime_locale', 'en_CA'));
if (Zend_Auth::getInstance()->hasIdentity())
{
$this->_redirect('Showbuilder');
$this->_redirect('showbuilder');
}
$authAdapter = new WHMCS_Auth_Adapter($username, $email, $password);
@ -58,7 +58,7 @@ class WhmcsLoginController extends Zend_Controller_Action
//$locale = $form->getValue('locale');
//Application_Model_Preference::SetUserLocale($locale);
$this->_redirect('Showbuilder');
$this->_redirect('showbuilder');
}
else {
echo("Sorry, that username or password was incorrect.");