tyler.durden/pandorafms
1
0
Fork 0
mirror of https://github.com/pandorafms/pandorafms.git synced 2025-04-08 18:55:09 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch '2984-problemas-tras-actualizacion-php7' into 'develop'

Browse Source 
fixed changes in pandora mobile

See merge request
This commit is contained in:
vgilc 2018-10-30 12:45:57 +01:00
commit 70884f73d0
4 changed files with 5 additions and 10 deletions

2
pandora_console/include/functions_groups.php

@ -14,6 +14,8 @@
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
// GNU General Public License for more details.
global $config;
require_once ($config['homedir'].'/include/functions_users.php');
/**

4
pandora_console/mobile/include/system.class.php

@ -12,10 +12,6 @@
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
// GNU General Public License for more details.
if (!isset($config)) {
require_once('../include/config.php');
}
//Singleton
class System {
private static $instance;

3
pandora_console/mobile/include/user.class.php

@ -34,10 +34,9 @@ class User {
self::$instance = $user;
}
else {
self::$instance = new self;
self::$instance = new self();
}
}
return self::$instance;
}

6
pandora_console/mobile/index.php

@ -25,6 +25,8 @@ require_once("include/system.class.php");
require_once("include/db.class.php");
require_once("include/user.class.php");
require_once('../include/config.php');
require_once('operation/home.php');
require_once('operation/tactical.php');
require_once('operation/groups.php');
@ -78,10 +80,6 @@ require_once($system->getConfig('homedir').'/include/constants.php');
$user = User::getInstance();
if (!is_object($user) && gettype($user) == 'object') {
$user = unserialize (serialize ($user));
}
$user->saveLogin();
$default_page = 'home';