Merge branch 'stable-3.1'

Marius Burkard

2016-05-04 c3189ce6c7301c3ec17878fd3918f31d0d3cb18a

 interface/web/index.php

@@ -31,10 +31,17 @@
require_once '../lib/config.inc.php';
require_once '../lib/app.inc.php';

if(!isset($_SESSION['s']['module']['name'])) $_SESSION['s']['module']['name'] = 'login';
// Check if we have an active users ession and redirect to login if thats not the case.
if($_SESSION['s']['user']['active'] != 1) {
   header('Location: /login/');
   die();
}

if(!isset($_SESSION['s']['module']['name'])) $_SESSION['s']['module']['name'] = 'dashboard';

$app->uses('tpl');
$app->tpl->newTemplate('main.tpl.htm');
$app->tpl->setVar('startpage', isset($_SESSION['s']['module']['startpage']) ? $_SESSION['s']['module']['startpage'] : '');
$app->tpl->setVar('logged_in', ($_SESSION['s']['user']['active'] != 1 ? 'n' : 'y'));

// tab change warning?
@@ -97,10 +104,15 @@
}
$tmp_base64 = explode(',', $base64_logo_txt, 2);
$logo_dimensions = $app->functions->getimagesizefromstring(base64_decode($tmp_base64[1]));
$app->tpl->setVar('base64_logo_width', $logo_dimensions[0]);
$app->tpl->setVar('base64_logo_height', $logo_dimensions[1]);
$app->tpl->setVar('base64_logo_width', $logo_dimensions[0].'px');
$app->tpl->setVar('base64_logo_height', $logo_dimensions[1].'px');
$app->tpl->setVar('base64_logo_txt', $base64_logo_txt);

// Title
if (!empty($sys_config['company_name'])) {
   $app->tpl->setVar('company_name', $sys_config['company_name']. ' :: ');
}

$app->tpl_defaults();
$app->tpl->pparse();
?>