deon/phpldapadmin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

RELEASE 0.9.7

Browse Source
This commit is contained in:
Deon George
2009-06-30 19:29:51 +10:00
parent d12096bbd3
commit df48b8ff9b
152 changed files with 19452 additions and 7789 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
templates/creation/custom.php
View File

@@ -1,10 +1,11 @@
<?php
// $Header: /cvsroot/phpldapadmin/phpldapadmin/templates/creation/custom.php,v 1.37 2004/10/24 23:51:51 uugdave Exp $
// $Header: /cvsroot/phpldapadmin/phpldapadmin/templates/creation/custom.php,v 1.41 2005/09/25 04:48:21 wurley Exp $
// Common to all templates
$rdn = isset( $_POST['rdn'] ) ? $_POST['rdn'] : null;
$container = $_POST['container'];
$server_id = $_POST['server_id'];
$ldapserver = $ldapservers->Instance($server_id);
// Unique to this template
$step = isset( $_POST['step'] ) ? $_POST['step'] : 1;
@@ -14,7 +15,7 @@ have_auth_info( $server_id ) or pla_error( $lang['not_enough_login_info'] );
if( $step == 1 )
{
$oclasses = get_schema_objectClasses( $server_id );
$oclasses = get_schema_objectClasses( $ldapserver );
if( ! $oclasses || ! is_array( $oclasses ) )
pla_error( "Unable to retrieve the schema from your LDAP server. Cannot continue with creation." );
?>
@@ -77,7 +78,7 @@ if( $step == 2 )
strlen( trim( $rdn ) ) != 0 or
pla_error( $lang['rdn_field_blank'] );
strlen( trim( $container ) ) == 0 or dn_exists( $server_id, $container ) or
strlen( trim( $container ) ) == 0 or dn_exists( $ldapserver, $container ) or
pla_error( sprintf( $lang['container_does_not_exist'], htmlspecialchars( $container ) ) );
$friendly_attrs = process_friendly_attr_table();
@@ -87,11 +88,11 @@ if( $step == 2 )
$dn = trim( $container ) ? $rdn . ',' . $container : $rdn;
// incrementally build up the all_attrs and required_attrs arrays
$schema_oclasses = get_schema_objectclasses( $server_id );
$schema_oclasses = get_schema_objectclasses( $ldapserver );
$required_attrs = array();
$all_attrs = array();
foreach( $oclasses as $oclass_name ) {
$oclass = get_schema_objectclass( $server_id, $oclass_name );
$oclass = get_schema_objectclass( $ldapserver, $oclass_name );
if( $oclass ) {
$required_attrs = array_merge( $required_attrs,
$oclass->getMustAttrNames( $schema_oclasses ) );
@@ -103,8 +104,8 @@ if( $step == 2 )
$required_attrs = array_unique( $required_attrs );
$all_attrs = array_unique( $all_attrs );
remove_aliases( $required_attrs, $server_id );
remove_aliases( $all_attrs, $server_id );
remove_aliases( $required_attrs, $ldapserver );
remove_aliases( $all_attrs, $ldapserver );
sort( $required_attrs );
sort( $all_attrs );
@@ -128,7 +129,7 @@ if( $step == 2 )
// remove binary attributes and add them to the binary_attrs array
$binary_attrs = array();
foreach( $all_attrs as $i => $attr_name ) {
if( is_attr_binary( $server_id, $attr_name ) ) {
if( is_attr_binary( $ldapserver, $attr_name ) ) {
unset( $all_attrs[ $i ] );
$binary_attrs[] = $attr_name;
}
@@ -183,7 +184,7 @@ if( $step == 2 )
?></b></td></tr>
<tr>
<td class="val"><input type="<?php echo (is_attr_binary( $server_id, $attr ) ? "file" : "text"); ?>"
<td class="val"><input type="<?php echo (is_attr_binary( $ldapserver, $attr ) ? "file" : "text"); ?>"
name="required_attrs[<?php echo htmlspecialchars($attr); ?>]"
value="<?php echo ($attr == $rdn_attr ? htmlspecialchars($rdn_value) : '') ?>" size="40" />
</tr>
@@ -272,7 +273,7 @@ function get_binary_attr_select_html( $binary_attrs, $friendly_attrs, $highlight
* Removes attributes from the array that are aliases for eachother
* (just removes the second instance of the aliased attr)
*/
function remove_aliases( &$attribute_list, $server_id )
function remove_aliases( &$attribute_list, $ldapserver )
{
// remove aliases from the attribute_list array
for( $i=0; $i<count( $attribute_list ); $i++ ) {
@@ -286,7 +287,7 @@ function remove_aliases( &$attribute_list, $server_id )
continue;
$attr_name2 = $attribute_list[ $k ];
//echo "Comparing $attr_name1 and $attr_name2<br>";
$attr1 = get_schema_attribute( $server_id, $attr_name1 );
$attr1 = get_schema_attribute( $ldapserver, $attr_name1 );
if( null == $attr1 )
continue;
if( $attr1->isAliasFor( $attr_name2 ) ) {
@@ -298,4 +299,3 @@ function remove_aliases( &$attribute_list, $server_id )
$attribute_list = array_values( $attribute_list );
}
?>

2
templates/creation/new_alias_template.php
View File

@@ -59,7 +59,7 @@ have_auth_info( $server_id ) or pla_error( "Not enough information to login to s
$attribute_name = $attribute_parts[1];
$alias_slashed = str_replace(',', '\,', $alias);
dn_exists( $server_id, $container ) or
dn_exists( $ldapserver, $container ) or
pla_error( "The container you specified (" . htmlspecialchars( $container ) . ") does not exist. " .
"Please go back and try again." );

4
templates/creation/new_dns_entry.php
View File

@@ -1,5 +1,5 @@
<?php
// $Header: /cvsroot/phpldapadmin/phpldapadmin/templates/creation/new_dns_entry.php,v 1.9 2004/10/24 23:51:51 uugdave Exp $
// $Header: /cvsroot/phpldapadmin/phpldapadmin/templates/creation/new_dns_entry.php,v 1.10 2005/03/05 06:27:07 wurley Exp $
// Common to all templates
$container = $_POST['container'];
@@ -56,7 +56,7 @@ if( isset($_POST['step']) )
$container = trim( $_POST['container'] );
$associateddomain = trim( $_POST['associateddomain'] );
dn_exists( $server_id, $container ) or
dn_exists( $ldapserver, $container ) or
pla_error( "The container you specified (" . htmlspecialchars( $container ) . ") does not exist. " .
"Please go back and try again." );
?>

6
templates/creation/new_nt_machine.php
View File

@@ -1,5 +1,5 @@
<?php
// $Header: /cvsroot/phpldapadmin/phpldapadmin/templates/creation/new_nt_machine.php,v 1.13 2004/12/16 22:59:50 uugdave Exp $
// $Header: /cvsroot/phpldapadmin/phpldapadmin/templates/creation/new_nt_machine.php,v 1.14 2005/03/05 06:27:07 wurley Exp $
// Common to all templates
@@ -21,7 +21,7 @@ $default_home_dir = '/dev/null';
check_server_id( $server_id ) or pla_error( "Bad server_id: " . htmlspecialchars( $server_id ) );
have_auth_info( $server_id ) or pla_error( "Not enough information to login to server. Please check your configuration." );
if( get_schema_objectclass( $server_id, 'sambaAccount' ) == null )
if( get_schema_objectclass( $ldapserver, 'sambaAccount' ) == null )
pla_error( "Your LDAP server does not have schema support for the sambaAccount objectClass. Cannot continue." );
?>
@@ -87,7 +87,7 @@ if( get_schema_objectclass( $server_id, 'sambaAccount' ) == null )
$machine_name = trim( $_POST['machine_name'] );
$uid_number = trim( $_POST['uid_number'] );
dn_exists( $server_id, $container ) or
dn_exists( $ldapserver, $container ) or
pla_error( "The container you specified (" . htmlspecialchars( $container ) . ") does not exist. " .
"Please go back and try again." );
?>

4
templates/creation/new_organizationalRole.php
View File

@@ -174,10 +174,10 @@ if ( !$verify ) {
$reg_zip = trim( $_POST['reg_zip'] );
$container = trim( $_POST['container'] );
dn_exists( $server_id, $container ) or
dn_exists( $ldapserver, $container ) or
pla_error( "The container you specified (" . htmlspecialchars( $container ) . ") does not exist. " .
"Please go back and try again." );
dn_exists( $server_id, $occupant ) or
dn_exists( $ldapserver, $occupant ) or
pla_error( "The occupant you specified (" . htmlspecialchars( $occupant ) . ") does not exist. " .
"Please go back and try again." );
0 != strlen( $or_name ) or

4
templates/creation/new_ou_template.php
View File

@@ -1,5 +1,5 @@
<?php
// $Header: /cvsroot/phpldapadmin/phpldapadmin/templates/creation/new_ou_template.php,v 1.11 2004/10/24 23:51:51 uugdave Exp $
// $Header: /cvsroot/phpldapadmin/phpldapadmin/templates/creation/new_ou_template.php,v 1.12 2005/03/05 06:27:07 wurley Exp $
// Common to all templates
$container = $_POST['container'];
@@ -48,7 +48,7 @@ have_auth_info( $server_id ) or pla_error( "Not enough information to login to s
$ou_name = trim( $_POST['ou_name'] );
$container = trim( $_POST['container'] );
dn_exists( $server_id, $container ) or
dn_exists( $ldapserver, $container ) or
pla_error( "The container you specified (" . htmlspecialchars( $container ) . ") does not exist. " .
"Please go back and try again." );

4
templates/creation/new_posix_group_template.php
View File

@@ -1,5 +1,5 @@
<?php
// $Header: /cvsroot/phpldapadmin/phpldapadmin/templates/creation/new_posix_group_template.php,v 1.9 2004/10/24 23:51:51 uugdave Exp $
// $Header: /cvsroot/phpldapadmin/phpldapadmin/templates/creation/new_posix_group_template.php,v 1.10 2005/03/05 06:27:07 wurley Exp $
// Common to all templates
$container = $_POST['container'];
@@ -75,7 +75,7 @@ have_auth_info( $server_id ) or pla_error( "Not enough information to login to s
if( '' != trim( $uid ) && ! in_array( $uid, $member_uids ) )
$member_uids[] = $uid;
dn_exists( $server_id, $container ) or
dn_exists( $ldapserver, $container ) or
pla_error( "The container you specified (" . htmlspecialchars( $container ) . ") does not exist. " .
"Please go back and try again." );

2
templates/creation/new_postfix_alias_template.php
View File

@@ -56,7 +56,7 @@ have_auth_info( $server_id ) or pla_error( "Not enough information to login to s
$mail = trim( $_POST['mail'] );
$maildrop = trim( $_POST['maildrop'] );
dn_exists( $server_id, $container ) or
dn_exists( $ldapserver, $container ) or
pla_error( "The container you specified (" . htmlspecialchars( $container ) . ") does not exist. " .
"Please go back and try again." );

4
templates/creation/new_security_object_template.php
View File

@@ -1,5 +1,5 @@
<?php
// $Header: /cvsroot/phpldapadmin/phpldapadmin/templates/creation/new_security_object_template.php,v 1.4 2004/10/24 23:51:51 uugdave Exp $
// $Header: /cvsroot/phpldapadmin/phpldapadmin/templates/creation/new_security_object_template.php,v 1.5 2005/03/05 06:27:07 wurley Exp $
// customize this to your needs
$default_container = "ou=server";
@@ -137,7 +137,7 @@ function autoFillHomeDir( form )
/* Critical assertions */
$password1 == $password2 or
pla_error( "Your passwords don't match. Please go back and try again." );
dn_exists( $server_id, $container ) or
dn_exists( $ldapserver, $container ) or
pla_error( "The container you specified (" . htmlspecialchars( $container ) . ") does not exist. " .
"Please go back and try again." );

6
templates/creation/new_smb3_nt_machine.php
View File

@@ -1,5 +1,5 @@
<?php
// $Header: /cvsroot/phpldapadmin/phpldapadmin/templates/creation/new_smb3_nt_machine.php,v 1.7 2004/12/16 22:59:50 uugdave Exp $
// $Header: /cvsroot/phpldapadmin/phpldapadmin/templates/creation/new_smb3_nt_machine.php,v 1.8 2005/03/05 06:27:07 wurley Exp $
// Common to all templates
$container = $_POST['container'];
@@ -21,7 +21,7 @@ $default_home_dir = '/dev/null';
check_server_id( $server_id ) or pla_error( "Bad server_id: " . htmlspecialchars( $server_id ) );
have_auth_info( $server_id ) or pla_error( "Not enough information to login to server. Please check your configuration." );
if( get_schema_objectclass( $server_id, 'sambaSamAccount' ) == null )
if( get_schema_objectclass( $ldapserver, 'sambaSamAccount' ) == null )
pla_error( "Your LDAP server does not have schema support for the sambaSamAccount objectClass. Cannot continue." );
?>
@@ -111,7 +111,7 @@ if( get_schema_objectclass( $server_id, 'sambaSamAccount' ) == null )
$samba3_domain_sid = trim( $_POST['samba3_domain_sid'] );
$samba3_computer_rid = trim( $_POST['samba3_rid'] );
dn_exists( $server_id, $container ) or
dn_exists( $ldapserver, $container ) or
pla_error( "The container you specified (" . htmlspecialchars( $container ) . ") does not exist. " .
"Please go back and try again." );
?>

12
templates/creation/new_smb3_user_template.php
View File

@@ -1,5 +1,5 @@
<?php
// $Header: /cvsroot/phpldapadmin/phpldapadmin/templates/creation/new_smb3_user_template.php,v 1.23 2004/12/16 22:59:50 uugdave Exp $
// $Header: /cvsroot/phpldapadmin/phpldapadmin/templates/creation/new_smb3_user_template.php,v 1.25 2005/09/23 13:43:55 wurley Exp $
$samba3_domains = get_samba3_domains();
@@ -15,7 +15,7 @@ if( isset($_POST['step']) )
$step = $_POST['step'];
//check if the sambaSamAccount objectClass is availaible
if( get_schema_objectclass( $server_id, 'sambaSamAccount' ) == null )
if( get_schema_objectclass( $ldapserver, 'sambaSamAccount' ) == null )
pla_error( "Your LDAP server does not have schema support for the sambaSamAccount objectClass. Cannot continue." );
check_server_id( $server_id ) or pla_error( "Bad server_id: " . htmlspecialchars( $server_id ) );
@@ -85,7 +85,7 @@ function autoFillSambaGroupRID( form ){
if( isset( $samba_base_groups ) )
$base_dn = $samba_base_groups;
$posix_groups = get_posix_groups( $server_id , $base_dn );
$posix_groups = get_posix_groups( $ldapserver , $base_dn );
?>
<form action="creation_template.php" method="post" id="user_form" name="user_form">
@@ -99,7 +99,7 @@ function autoFillSambaGroupRID( form ){
<tr>
<td></td>
<td class="heading">UID Number:</td>
<?php $next_uid_number = get_next_uid_number( $server_id ); ?>
<?php $next_uid_number = get_next_uid_number( $ldapserver ); ?>
<td><input type="text" name="uid_number" value="<?php echo $next_uid_number; ?>" onChange="autoFillSambaRID(this.form)" />
<?php if( false !== $next_uid_number ) echo "<small>(automatically determined)</small>"; ?>
</td>
@@ -232,7 +232,7 @@ function autoFillSambaGroupRID( form ){
</tr>
<tr>
<td></td>
<?php $posix_groups_found = ( is_array( $posix_groups )?1:0 );?>
<?php $posix_groups_found = ( count( $posix_groups )>0?1:0 );?>
<td class="heading"><?php echo $posix_groups_found?"Unix Group":"GID Number"?>:</td>
<td>
<?php if( $posix_groups_found ){?>
@@ -355,7 +355,7 @@ function autoFillSambaGroupRID( form ){
pla_error( "You cannot leave the UID number blank. Please go back and try again." );
is_numeric( $uid_number ) or
pla_error( "You can only enter numeric values for the UID number field. Please go back and try again." );
dn_exists( $server_id, $container ) or
dn_exists( $ldapserver, $container ) or
pla_error( "The container you specified (" . htmlspecialchars( $container ) . ") does not exist. " .
"Please go back and try again." );

6
templates/creation/new_smbgroup_template.php
View File

@@ -1,5 +1,5 @@
<?php
// $Header: /cvsroot/phpldapadmin/phpldapadmin/templates/creation/new_smbgroup_template.php,v 1.13 2004/12/16 22:59:50 uugdave Exp $
// $Header: /cvsroot/phpldapadmin/phpldapadmin/templates/creation/new_smbgroup_template.php,v 1.14 2005/03/05 06:27:07 wurley Exp $
// Common to all templates
$rdn = isset( $_POST['rdn'] ) ? $_POST['rdn'] : null;
@@ -19,7 +19,7 @@ if( isset($_POST['step']) )
check_server_id( $server_id ) or pla_error( "Bad server_id: " . htmlspecialchars( $server_id ) );
have_auth_info( $server_id ) or pla_error( "Not enough information to login to server. Please check your configuration." );
if( get_schema_objectclass( $server_id, 'sambaGroupMapping' ) == null )
if( get_schema_objectclass( $ldapserver, 'sambaGroupMapping' ) == null )
pla_error( "Your LDAP server does not have schema support for the sambaGroupMapping objectClass. Cannot continue." );
?>
@@ -200,7 +200,7 @@ function autoFillSambaGroupRID( form ){
if( '' != trim( $uid ) && ! in_array( $uid, $member_uids ) )
$member_uids[] = $uid;
dn_exists( $server_id, $container ) or
dn_exists( $ldapserver, $container ) or
pla_error( "The container you specified (" . htmlspecialchars( $container ) . ") does not exist. " .
"Please go back and try again." );

6
templates/creation/new_smbuser_template.php
View File

@@ -1,5 +1,5 @@
<?php
// $Header: /cvsroot/phpldapadmin/phpldapadmin/templates/creation/new_smbuser_template.php,v 1.17 2004/12/16 22:59:50 uugdave Exp $
// $Header: /cvsroot/phpldapadmin/phpldapadmin/templates/creation/new_smbuser_template.php,v 1.18 2005/03/05 06:27:07 wurley Exp $
$default_container = "ou=Users";
$default_home = "/home";
@@ -12,7 +12,7 @@
$step = $_POST['step'];
//check if the sambaSamAccount objectClass is availaible
if( get_schema_objectclass( $server_id, 'sambaAccount' ) == null )
if( get_schema_objectclass( $ldapserver, 'sambaAccount' ) == null )
pla_error( "Your LDAP server does not have schema support for the sambaAccount objectClass. Cannot continue." );
check_server_id( $server_id ) or pla_error( "Bad server_id: " . htmlspecialchars( $server_id ) );
@@ -198,7 +198,7 @@
pla_error( "You cannot leave the UID number blank. Please go back and try again." );
is_numeric( $uid_number ) or
pla_error( "You can only enter numeric values for the UID number field. Please go back and try again." );
dn_exists( $server_id, $container ) or
dn_exists( $ldapserver, $container ) or
pla_error( "The container you specified (" . htmlspecialchars( $container ) . ") does not exist. " .
"Please go back and try again." );

8
templates/creation/new_user_template.php
View File

@@ -1,5 +1,5 @@
<?php
// $Header: /cvsroot/phpldapadmin/phpldapadmin/templates/creation/new_user_template.php,v 1.25 2004/12/20 14:12:33 uugdave Exp $
// $Header: /cvsroot/phpldapadmin/phpldapadmin/templates/creation/new_user_template.php,v 1.26 2005/03/05 06:27:07 wurley Exp $
/*
* TODO Add a check: If the server is configured to use auto_uid_numbers AND the
@@ -199,7 +199,7 @@ function autoFillHomeDir( form )
<tr>
<td></td>
<td class="heading"><?php echo $lang['t_uid_number']; ?>:</td>
<?php $next_uid_number = ( auto_uid_numbers_enabled( $server_id ) ? get_next_uid_number( $server_id ) : false ); ?>
<?php $next_uid_number = ( auto_uid_numbers_enabled( $server_id ) ? get_next_uid_number( $ldapserver ) : false ); ?>
<td><input type="text" name="uid_number" value="<?php echo $next_uid_number ?>" />
<?php if( false !== $next_uid_number ) echo "<small>" . $lang['t_auto_det'] . "</small>"; ?>
</td>
@@ -210,7 +210,7 @@ function autoFillHomeDir( form )
$base_dn = null;
if( isset( $base_posix_groups ) )
$base_dn = $base_posix_groups;
$posix_groups = get_posix_groups( $server_id, $base_dn );
$posix_groups = get_posix_groups( $ldapserver, $base_dn );
$posix_groups_found = ( count( $posix_groups ) ? true : false ); ?>
<td class="heading"><?php echo $posix_groups_found ? $lang['t_group'] : $lang['t_gid_number'] ?>:</td>
<td>
@@ -263,7 +263,7 @@ function autoFillHomeDir( form )
pla_error( sprintf( $lang['t_err_field_num'], $lang['t_uid_number'] ) );
is_numeric( $gid_number ) or
pla_error( sprintf( $lang['t_err_field_num'], $lang['t_gid_number'] ) );
dn_exists( $server_id, $container ) or
dn_exists( $ldapserver, $container ) or
pla_error( sprintf( $lang['t_err_bad_container'], htmlspecialchars( $container ) ) );
$password = password_hash( $password1, $encryption );