WMDE
/
LDAPAccountManager
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

added isLoggedIn()

This commit is contained in:
Roland Gruber 2014-10-25 19:17:53 +00:00
parent 6d1904ffd6
commit 092ca3ff57
14 changed files with 25 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lam/lib/modules/account.inc
View File

@ -55,7 +55,7 @@ class account extends baseModule {
* @see baseModule::get_metaData()
*/
function get_metaData() {
if (isset($_SESSION['loggedIn']) && ($_SESSION['loggedIn'] === true)) {
if (isLoggedIn()) {
$modules = $_SESSION['config']->get_AccountModules($this->get_scope());
}
$return = array();
@ -81,7 +81,7 @@ class account extends baseModule {
$return['PDF_fields'] = array(
'description' => _('Description')
);
if (isset($_SESSION['loggedIn']) && ($_SESSION['loggedIn'] === true) && !in_array('posixAccount', $modules)) {
if (isLoggedIn() && !in_array('posixAccount', $modules)) {
$return['PDF_fields']['uid'] = _('User name');
}
// help Entries

2
lam/lib/modules/ddns.inc
View File

@ -114,7 +114,7 @@ class ddns extends baseModule {
'reverseZone' => _('Reverse zone name'),
);
// upload fields
if (isset($_SESSION['loggedIn']) && $this->check_if_ddns_is_enable()) {
if (isLoggedIn() && $this->check_if_ddns_is_enable()) {
$return['upload_columns'] = array(
array(
'name' => 'ddns_DNSserver',

2
lam/lib/modules/freeRadius.inc
View File

@ -164,7 +164,7 @@ class freeRadius extends baseModule {
$profileElements[] = $dialupAccessSelect;
$return['profile_mappings']['freeRadius_dialupAccess'] = 'dialupAccess';
}
if (!$this->isBooleanConfigOptionSet('freeRadius_hideRadiusProfileDn')) {
if (!$this->isBooleanConfigOptionSet('freeRadius_hideRadiusProfileDn') && isLoggedIn()) {
$profileOptions = array('-' => '');
foreach ($this->getProfiles() as $dn) {
$profileOptions[getAbstractDN($dn)] = $dn;

2
lam/lib/modules/inetOrgPerson.inc
View File

@ -631,7 +631,7 @@ class inetOrgPerson extends baseModule implements passwordService {
$return['PDF_fields']['initials'] = _('Initials');
}
if (isset($_SESSION['loggedIn']) && ($_SESSION['loggedIn'] === true)) {
if (isLoggedIn()) {
$modules = $_SESSION['config']->get_AccountModules($this->get_scope());
if (!in_array('posixAccount', $modules)) {
if (!$this->isBooleanConfigOptionSet('inetOrgPerson_hideUID')) {

4
lam/lib/modules/posixAccount.inc
View File

@ -276,7 +276,7 @@ class posixAccount extends baseModule implements passwordService {
// upload
$return['upload_preDepends'] = array('inetOrgPerson');
// user specific upload options
if (($this->get_scope() == 'user') && isset($_SESSION['loggedIn']) && ($_SESSION['loggedIn'] === true)) {
if (($this->get_scope() == 'user') && isLoggedIn()) {
$return['upload_columns'] = array(
array(
'name' => 'posixAccount_userName',
@ -3098,7 +3098,7 @@ class posixAccount extends baseModule implements passwordService {
*/
private function getShells() {
// self service
if (!isset($_SESSION['loggedIn']) && isset($this->selfServiceSettings) && isset($this->selfServiceSettings->moduleSettings['posixAccount_shells'])
if (!isLoggedIn() && isset($this->selfServiceSettings) && isset($this->selfServiceSettings->moduleSettings['posixAccount_shells'])
&& (sizeof($this->selfServiceSettings->moduleSettings['posixAccount_shells'])) > 0) {
return $this->selfServiceSettings->moduleSettings['posixAccount_shells'];
}

2
lam/lib/modules/sambaGroupMapping.inc
View File

@ -116,7 +116,7 @@ class sambaGroupMapping extends baseModule {
);
// upload fields
// search existing Samba 3 domains
if (isset($_SESSION['loggedIn']) && ($_SESSION['loggedIn'] === true)) {
if (isLoggedIn()) {
$return['upload_columns'] = array(
array(
'name' => 'sambaGroupMapping_name',

4
lam/lib/profiles.inc
View File

@ -115,7 +115,7 @@ function loadAccountProfile($profile, $scope) {
* @return boolean true, if saving succeeded
*/
function saveAccountProfile($attributes, $profile, $scope) {
if (!$_SESSION['loggedIn'] == true) return false;
if (!isLoggedIn()) return false;
// check profile name
if (!preg_match("/^[0-9a-z _-]+$/i", $profile) || !preg_match("/^[a-z]+$/i", $scope)) return false;
if (!is_array($attributes)) {
@ -152,7 +152,7 @@ function saveAccountProfile($attributes, $profile, $scope) {
* @return boolean true if profile was deleted
*/
function delAccountProfile($file, $scope) {
if (!$_SESSION['loggedIn'] == true) return false;
if (!isLoggedIn()) return false;
if (!preg_match("/^[0-9a-z _-]+$/i", $file) || !preg_match("/^[a-z]+$/i", $scope)) return false;
$prof = substr(__FILE__, 0, strlen(__FILE__) - 16) . "config/profiles/". $_SESSION['config']->getName() . '/' . $file . "." . $scope;
if (is_file($prof)) {

9
lam/lib/security.inc
View File

@ -472,4 +472,13 @@ function checkIfToolIsActive($tool) {
}
}
/**
* Returns if the user is logged in.
*
* @return boolean is logged in
*/
function isLoggedIn() {
return (isset($_SESSION['loggedIn']) && ($_SESSION['loggedIn'] === true));
}
?>

2
lam/lib/types/group.inc
View File

@ -58,7 +58,7 @@ class group extends baseType {
* @return string alias name
*/
function getAlias() {
if (isset($_SESSION['loggedIn']) && isset($_SESSION['config'])) {
if (isLoggedIn() && isset($_SESSION['config'])) {
$modules = $_SESSION['config']->get_AccountModules('group');
if (in_array('organizationalRole', $modules)) {
return _('Roles');

2
lam/templates/account/edit.php
View File

@ -49,7 +49,7 @@ include_once('../../lib/modules.inc');
startSecureSession();
// Redirect to startpage if user is not loged in
if (!isset($_SESSION['loggedIn']) || ($_SESSION['loggedIn'] !== true)) {
if (!isLoggedIn()) {
metaRefresh("../login.php");
exit;
}

2
lam/templates/delete.php
View File

@ -54,7 +54,7 @@ if (!checkIfWriteAccessIsAllowed()) {
}
// Redirect to startpage if user is not loged in
if (!isset($_SESSION['loggedIn']) || ($_SESSION['loggedIn'] !== true)) {
if (!isLoggedIn()) {
metaRefresh("login.php");
exit;
}

2
lam/templates/massBuildAccounts.php
View File

@ -48,7 +48,7 @@ checkIfToolIsActive('toolFileUpload');
if (!checkIfWriteAccessIsAllowed()) die();
// Redirect to startpage if user is not loged in
if (!isset($_SESSION['loggedIn']) || ($_SESSION['loggedIn'] !== true)) {
if (!isLoggedIn()) {
metaRefresh("login.php");
exit;
}

2
lam/templates/massDoUpload.php
View File

@ -52,7 +52,7 @@ checkIfToolIsActive('toolFileUpload');
if (!checkIfWriteAccessIsAllowed()) die();
// Redirect to startpage if user is not loged in
if (!isset($_SESSION['loggedIn']) || ($_SESSION['loggedIn'] !== true)) {
if (!isLoggedIn()) {
metaRefresh("login.php");
exit;
}

2
lam/templates/masscreate.php
View File

@ -52,7 +52,7 @@ if (!checkIfWriteAccessIsAllowed()) die();
checkIfToolIsActive('toolFileUpload');
// Redirect to startpage if user is not loged in
if (!isset($_SESSION['loggedIn']) || ($_SESSION['loggedIn'] !== true)) {
if (!isLoggedIn()) {
metaRefresh("login.php");
exit;
}