tyler.durden
/
pandorafms
mirror of https://github.com/pandorafms/pandorafms.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch '2379-Entrar-a-consola-sin-licencia-mobile' into 'develop' 

Implemented license validation for mobile console

See merge request artica/pandorafms!1712
This commit is contained in:
vgilc 2018-08-27 09:14:32 +02:00
parent 69545d7ed8 8e2f4b0eaa
commit df4c61d673
2 changed files with 26 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pandora_console/index.php
View File

@ -202,9 +202,9 @@ $process_login = false;
// Update user password
$change_pass = get_parameter_post('renew_password', 0);
if ($change_pass == 1) {
if ($change_pass == 1) {
$password_old = (string) get_parameter_post ('old_password', '');
$password_new = (string) get_parameter_post ('new_password', '');
$password_confirm = (string) get_parameter_post ('confirm_new_password', '');

24
pandora_console/mobile/index.php
View File

@ -42,6 +42,8 @@ $enterpriseHook = enterprise_include('mobile/include/enterprise.class.php');
$enterpriseHook = enterprise_include('mobile/operation/dashboard.php');
$enterpriseHook = enterprise_include('mobile/operation/home.php');
$is_mobile=true;
if (!empty ($config["https"]) && empty ($_SERVER['HTTPS'])) {
$query = '';
if (sizeof ($_REQUEST))
@ -116,6 +118,13 @@ if ($action != "ajax") {
}
}
if ($user->isLogged()) {
if (file_exists ("../enterprise/load_enterprise.php")) {
include_once ("../enterprise/load_enterprise.php");
}
}
switch ($action) {
case 'ajax':
$parameter1 = $system->getRequest('parameter1', false);
@ -169,6 +178,11 @@ switch ($action) {
break;
case 'login':
if ($user->login() && $user->isLogged()) {
if (file_exists ("../enterprise/load_enterprise.php")) {
include_once ("../enterprise/load_enterprise.php");
}
if ($user->isWaitingDoubleAuth()) {
if ($user->validateDoubleAuthCode()) {
// Logged. Refresh the page
@ -192,6 +206,12 @@ switch ($action) {
break;
case 'double_auth':
if ($user->isLogged()) {
if (file_exists ("../enterprise/load_enterprise.php")) {
include_once ("../enterprise/load_enterprise.php");
}
if ($user->validateDoubleAuthCode()) {
$user_language = get_user_language ($system->getConfig('id_user'));
if (file_exists ('../include/languages/'.$user_language.'.mo')) {
@ -358,4 +378,8 @@ switch ($action) {
}
break;
}
?>