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

Merge pull request #14 from LDAPAccountManager/type_api_tmp 

Type api tmp
This commit is contained in:
gruberroland 2016-12-26 19:33:09 +01:00 committed by GitHub
parent fe4fa15ee7 294ab941b1
commit 8a432792ee
19 changed files with 576 additions and 511 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
composer.json
View File

@ -1,6 +1,6 @@
{
"require-dev" : {
"phpunit/phpunit" : "5.5.*",
"phpunit/phpunit" : "4.5.0",
"squizlabs/php_codesniffer" : "2.7.1"
}
}

9
lam/lib/tools/fileUpload.inc
View File

@ -1,9 +1,10 @@
<?php
namespace LAM\TOOLS\UPLOAD;
/*
$Id$
This code is part of LDAP Account Manager (http://www.ldap-account-manager.org/)
Copyright (C) 2009 - 2011 Roland Gruber
Copyright (C) 2009 - 2016 Roland Gruber
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@ -33,7 +34,7 @@ $Id$
*
* @package tools
*/
class toolFileUpload implements LAMTool {
class toolFileUpload implements \LAMTool {
/**
* Returns the name of the tool.
@ -114,7 +115,9 @@ class toolFileUpload implements LAMTool {
* @return boolean visible
*/
function isVisible() {
return (sizeof($_SESSION['config']->get_ActiveTypes()) > 0);
$typeManager = new \LAM\TYPES\TypeManager();
$types = $typeManager->getConfiguredTypes();
return (sizeof($types) > 0);
}
/**

5
lam/lib/tools/multiEdit.inc
View File

@ -1,9 +1,10 @@
<?php
namespace LAM\TOOLS\MULTI_EDIT;
/*
$Id$
This code is part of LDAP Account Manager (http://www.ldap-account-manager.org/)
Copyright (C) 2013 Roland Gruber
Copyright (C) 2013 - 2016 Roland Gruber
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@ -33,7 +34,7 @@ $Id$
*
* @package tools
*/
class toolMultiEdit implements LAMTool {
class toolMultiEdit implements \LAMTool {
/**
* Returns the name of the tool.

9
lam/lib/tools/ouEditor.inc
View File

@ -1,9 +1,10 @@
<?php
namespace LAM\TOOLS\OU_EDIT;
/*
$Id$
This code is part of LDAP Account Manager (http://www.ldap-account-manager.org/)
Copyright (C) 2009 - 2011 Roland Gruber
Copyright (C) 2009 - 2016 Roland Gruber
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@ -33,7 +34,7 @@ $Id$
*
* @package tools
*/
class toolOUEditor implements LAMTool {
class toolOUEditor implements \LAMTool {
/**
* Returns the name of the tool.
@ -114,7 +115,9 @@ class toolOUEditor implements LAMTool {
* @return boolean visible
*/
function isVisible() {
return (sizeof($_SESSION['config']->get_ActiveTypes()) > 0);
$typeManager = new \LAM\TYPES\TypeManager();
$types = $typeManager->getConfiguredTypes();
return (sizeof($types) > 0);
}
/**

9
lam/lib/tools/pdfEdit.inc
View File

@ -1,9 +1,10 @@
<?php
namespace LAM\TOOLS\PDF_EDITOR;
/*
$Id$
This code is part of LDAP Account Manager (http://www.ldap-account-manager.org/)
Copyright (C) 2009 - 2011 Roland Gruber
Copyright (C) 2009 - 2016 Roland Gruber
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@ -33,7 +34,7 @@ $Id$
*
* @package tools
*/
class toolPDFEditor implements LAMTool {
class toolPDFEditor implements \LAMTool {
/**
* Returns the name of the tool.
@ -114,7 +115,9 @@ class toolPDFEditor implements LAMTool {
* @return boolean visible
*/
function isVisible() {
return (sizeof($_SESSION['config']->get_ActiveTypes()) > 0);
$typeManager = new \LAM\TYPES\TypeManager();
$types = $typeManager->getConfiguredTypes();
return (sizeof($types) > 0);
}
/**

9
lam/lib/tools/profileEditor.inc
View File

@ -1,9 +1,10 @@
<?php
namespace LAM\TOOLS\PROFILE_EDITOR;
/*
$Id$
This code is part of LDAP Account Manager (http://www.ldap-account-manager.org/)
Copyright (C) 2009 - 2011 Roland Gruber
Copyright (C) 2009 - 2016 Roland Gruber
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@ -33,7 +34,7 @@ $Id$
*
* @package tools
*/
class toolProfileEditor implements LAMTool {
class toolProfileEditor implements \LAMTool {
/**
* Returns the name of the tool.
@ -114,7 +115,9 @@ class toolProfileEditor implements LAMTool {
* @return boolean visible
*/
function isVisible() {
return (sizeof($_SESSION['config']->get_ActiveTypes()) > 0);
$typeManager = new \LAM\TYPES\TypeManager();
$types = $typeManager->getConfiguredTypes();
return (sizeof($types) > 0);
}
/**

3
lam/lib/tools/schemaBrowser.inc
View File

@ -1,4 +1,5 @@
<?php
namespace LAM\TOOLS\SCHEMA;
/*
$Id$
@ -33,7 +34,7 @@ $Id$
*
* @package tools
*/
class toolSchemaBrowser implements LAMTool {
class toolSchemaBrowser implements \LAMTool {
/**
* Returns the name of the tool.

5
lam/lib/tools/serverInfo.inc
View File

@ -1,9 +1,10 @@
<?php
namespace LAM\TOOLS\SERVER_INFO;
/*
$Id$
This code is part of LDAP Account Manager (http://www.ldap-account-manager.org/)
Copyright (C) 2009 - 2011 Roland Gruber
Copyright (C) 2009 - 2016 Roland Gruber
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@ -33,7 +34,7 @@ $Id$
*
* @package tools
*/
class toolServerInformation implements LAMTool {
class toolServerInformation implements \LAMTool {
/**
* Returns the name of the tool.

13
lam/lib/tools/tests.inc
View File

@ -1,9 +1,10 @@
<?php
namespace LAM\TOOLS\TESTS;
/*
$Id$
This code is part of LDAP Account Manager (http://www.ldap-account-manager.org/)
Copyright (C) 2009 - 2011 Roland Gruber
Copyright (C) 2009 - 2016 Roland Gruber
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@ -33,7 +34,7 @@ $Id$
*
* @package tools
*/
class toolTests implements LAMTool {
class toolTests implements \LAMTool {
/**
* Returns the name of the tool.
@ -106,13 +107,13 @@ class toolTests implements LAMTool {
*/
function getSubTools() {
$return = array();
$lamdaemonTest = new LAMSubTool();
$lamdaemonTest = new \LAMSubTool();
$lamdaemonTest->name = _("Lamdaemon test");
$lamdaemonTest->link = 'tests/lamdaemonTest.php';
$lamdaemonTest->description = _("Check if quotas and homedirectories can be managed.");
$lamdaemonTest->image = 'lamdaemonSmall.png';
$return[] = $lamdaemonTest;
$schemaTest = new LAMSubTool();
$schemaTest = new \LAMSubTool();
$schemaTest->name = _("Schema test");
$schemaTest->link = 'tests/schemaTest.php';
$schemaTest->description = _("Check if the LDAP schema fits the requirements of the selected account modules.");
@ -127,7 +128,9 @@ class toolTests implements LAMTool {
* @return boolean visible
*/
function isVisible() {
return (sizeof($_SESSION['config']->get_ActiveTypes()) > 0);
$typeManager = new \LAM\TYPES\TypeManager();
$types = $typeManager->getConfiguredTypes();
return (sizeof($types) > 0);
}
/**

28
lam/templates/multiEdit.php
View File

@ -1,4 +1,22 @@
<?php
namespace LAM\TOOLS\MULTI_EDIT;
use \htmlTable;
use \htmlTitle;
use \htmlSelect;
use \htmlOutputText;
use \htmlHelpLink;
use \htmlInputField;
use \htmlSubTitle;
use \htmlTableExtendedInputField;
use \htmlButton;
use \htmlStatusMessage;
use \htmlSpacer;
use \htmlHiddenInput;
use \htmlGroup;
use \htmlDiv;
use \htmlJavaScript;
use \htmlLink;
use \htmlInputTextarea;
/*
$Id$
@ -85,11 +103,15 @@ function displayStartPage() {
$hideRules = array();
$container->addElement(new htmlOutputText(_('LDAP suffix')));
$suffixGroup = new htmlTable();
$types = $_SESSION['config']->get_ActiveTypes();
$typeManager = new \LAM\TYPES\TypeManager();
$types = $typeManager->getConfiguredTypes();
$suffixes = array();
foreach ($types as $type) {
$suffixes[LAM\TYPES\getTypeAlias($type)] = $_SESSION['config']->get_Suffix($type);
$hideRules[$_SESSION['config']->get_Suffix($type)] = array('otherSuffix');
if ($type->isHidden()) {
continue;
}
$suffixes[$type->getAlias()] = $type->getSuffix();
$hideRules[$type->getSuffix()] = array('otherSuffix');
}
$treeSuffix = $_SESSION['config']->get_Suffix('tree');
if (!empty($treeSuffix)) {

22
lam/templates/ou_edit.php
View File

@ -1,4 +1,15 @@
<?php
namespace LAM\TOOLS\OU_EDIT;
use \htmlTable;
use \htmlSpacer;
use \htmlOutputText;
use \htmlButton;
use \htmlHiddenInput;
use \htmlSubTitle;
use \htmlStatusMessage;
use \htmlSelect;
use \htmlHelpLink;
use \htmlInputField;
/*
$Id$
@ -51,8 +62,6 @@ if (!empty($_POST)) {
validateSecurityToken();
}
$types = $_SESSION['config']->get_ActiveTypes();
// check if deletion was canceled
if (isset($_POST['abort'])) {
display_main(null, null);
@ -166,13 +175,14 @@ function display_main($message, $error) {
$container->addElement($msg, true);
}
$typeManager = new \LAM\TYPES\TypeManager();
$typeList = $typeManager->getConfiguredTypes();
$types = array();
$typeList = $_SESSION['config']->get_ActiveTypes();
for ($i = 0; $i < sizeof($typeList); $i++) {
if (isAccountTypeHidden($typeList[$i]) || !checkIfWriteAccessIsAllowed($typeList[$i])) {
foreach ($typeList as $type) {
if ($type->isHidden() || !checkIfWriteAccessIsAllowed($type->getId())) {
continue;
}
$types[$typeList[$i]] = LAM\TYPES\getTypeAlias($typeList[$i]);
$types[$type->getId()] = $type->getAlias();
}
natcasesort($types);
$options = array();

2
lam/tests/lib/LAMConfigTest.php
View File

@ -21,7 +21,7 @@
*/
include_once (dirname ( __FILE__ ) . '/../utils/configuration.inc');
include_once 'lam/tests/utils/configuration.inc';
/**
* LAMConfig test case.

11
lam/tests/lib/modules/ppolicyUserTest.php
View File

@ -21,10 +21,12 @@
*/
include_once '../../../lib/baseModule.inc';
include_once '../../../lib/modules.inc';
include_once '../../../lib/passwordExpirationJob.inc';
include_once '../../../lib/modules/ppolicyUser.inc';
if (is_readable('lam/lib/modules/ppolicyUser.inc')) {
include_once 'lam/lib/baseModule.inc';
include_once 'lam/lib/modules.inc';
include_once 'lam/lib/passwordExpirationJob.inc';
include_once 'lam/lib/modules/ppolicyUser.inc';
/**
* Checks the ppolicy expire job.
@ -216,5 +218,6 @@ class PPolicyUserPasswordNotifyJobTest extends PHPUnit_Framework_TestCase {
}
}
?>

7
lam/tests/lib/modules/sambaSamAccountTest.php
View File

@ -21,10 +21,9 @@
*/
include_once (dirname ( __FILE__ ) . '/../../../lib/baseModule.inc');
include_once (dirname ( __FILE__ ) . '/../../../lib/modules.inc');
include_once (dirname ( __FILE__ ) . '/../../../lib/passwordExpirationJob.inc');
include_once (dirname ( __FILE__ ) . '/../../../lib/modules/sambaSamAccount.inc');
include_once 'lam/lib/baseModule.inc';
include_once 'lam/lib/modules.inc';
include_once 'lam/lib/modules/sambaSamAccount.inc';
/**
* Checks the shadow expire job.

11
lam/tests/lib/modules/shadowAccountTest.php
View File

@ -21,10 +21,12 @@
*/
include_once (dirname ( __FILE__ ) . '/../../../lib/baseModule.inc');
include_once (dirname ( __FILE__ ) . '/../../../lib/modules.inc');
include_once (dirname ( __FILE__ ) . '/../../../lib/passwordExpirationJob.inc');
include_once (dirname ( __FILE__ ) . '/../../../lib/modules/shadowAccount.inc');
if (is_readable('lam/lib/passwordExpirationJob.inc')) {
include_once 'lam/lib/baseModule.inc';
include_once 'lam/lib/modules.inc';
include_once 'lam/lib/passwordExpirationJob.inc';
include_once 'lam/lib/modules/shadowAccount.inc';
/**
* Checks the shadow expire job.
@ -161,5 +163,6 @@ class ShadowAccountPasswordNotifyJobTest extends PHPUnit_Framework_TestCase {
}
}
?>

10
lam/tests/lib/modules/sudoRoleTest.php
View File

@ -3,7 +3,7 @@
$Id$
This code is part of LDAP Account Manager (http://www.ldap-account-manager.org/)
Copyright (C) 2014 Roland Gruber
Copyright (C) 2014 - 2016 Roland Gruber
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@ -21,8 +21,10 @@ $Id$
*/
include_once (dirname ( __FILE__ ) . '/../../../lib/baseModule.inc');
include_once (dirname ( __FILE__ ) . '/../../../lib/modules/sudoRole.inc');
if (is_readable('lam/lib/modules/sudoRole.inc')) {
include_once 'lam/lib/baseModule.inc';
include_once 'lam/lib/modules/sudoRole.inc';
/**
* Checks sudo role functions.
@ -78,4 +80,6 @@ class SudoRoleTest extends PHPUnit_Framework_TestCase {
}
}
?>

4
lam/tests/lib/securityTest.php
View File

@ -23,8 +23,8 @@ $Id$
$_SERVER ['REMOTE_ADDR'] = '127.0.0.1';
include_once (dirname ( __FILE__ ) . '/../utils/configuration.inc');
include_once (dirname ( __FILE__ ) . '/../../lib/security.inc');
include_once 'lam/tests/utils/configuration.inc';
include_once 'lam/lib/security.inc';
/**
* Checks password checking functions.

2
lam/tests/lib/typesTest.php
View File

@ -21,7 +21,7 @@ $Id$
*/
require_once '../../lib/types.inc';
require_once 'lam/lib/types.inc';
/**
* Checks ListAttribute.

6
phpunit.xml
View File

@ -5,4 +5,10 @@
<directory>lam/tests</directory>
</testsuite>
</testsuites>
<php>
<includePath>.</includePath>
</php>
<logging>
<log type="coverage-html" target="../code-coverage/html"/>
</logging>
</phpunit>