@@ -159,16 +182,18 @@ foreach( $avail_attrs as $i => $attr ) {
/**
* Given an attribute $x, this returns true if it is NOT already specified
* in the current entry, returns false otherwise.
+ *
+ * @param attr $x
+ * @return bool
+ * @ignore
*/
-function not_an_attr( $x )
-{
+function not_an_attr( $x ) {
global $attrs;
+
//return ! isset( $attrs[ strtolower( $x ) ] );
foreach( $attrs as $attr => $values )
if( 0 == strcasecmp( $attr, $x ) )
return false;
return true;
}
-
-
?>
diff --git a/add_oclass.php b/add_oclass.php
index 502a691..1605e54 100644
--- a/add_oclass.php
+++ b/add_oclass.php
@@ -1,36 +1,41 @@
isReadOnly() )
+ pla_error( $lang['no_updates_in_read_only_mode'] );
+if( ! $ldapserver->haveAuthInfo())
+ pla_error( $lang['not_enough_login_info'] );
+
$dn = rawurldecode( $_POST['dn'] );
-$encoded_dn = rawurlencode( $dn );
$new_oclass = $_POST['new_oclass'];
-$server_id = $_POST['server_id'];
$new_attrs = $_POST['new_attrs'];
-if( is_attr_read_only( $server_id, 'objectClass' ) )
- pla_error( "ObjectClasses are flagged as read only in the phpLDAPadmin configuration." );
-if( is_server_read_only( $server_id ) )
- pla_error( $lang['no_updates_in_read_only_mode'] );
+$encoded_dn = rawurlencode( $dn );
-check_server_id( $server_id ) or pla_error( $lang['bad_server_id'] );
-have_auth_info( $server_id ) or pla_error( $lang['not_enough_login_info'] );
+if( is_attr_read_only( $ldapserver, 'objectClass' ) )
+ pla_error( "ObjectClasses are flagged as read only in the phpLDAPadmin configuration." );
$new_entry = array();
$new_entry['objectClass'] = $new_oclass;
@@ -42,29 +47,24 @@ if( is_array( $new_attrs ) && count( $new_attrs ) > 0 )
foreach( $new_attrs as $attr => $val ) {
// Check to see if this is a unique Attribute
- if( $badattr = checkUniqueAttr( $server_id, $dn, $attr, array($val) ) ) {
- $search_href='search.php?search=true&form=advanced&server_id=' . $server_id . '&filter=' . $attr . '=' . $badattr;
- pla_error(sprintf( $lang['unique_attr_failed'] , $attr,$badattr,$dn,$search_href ) );
+ if( $badattr = checkUniqueAttr( $ldapserver, $dn, $attr, array($val) ) ) {
+ $search_href = sprintf('search.php?search=true&form=advanced&server_id=%s&filter=%s=%s',$server_id,$attr,$badattr);
+ pla_error(sprintf( $lang['unique_attr_failed'],$attr,$badattr,$dn,$search_href ) );
}
$new_entry[ $attr ] = $val;
}
-//echo "
";
+//echo "
";
//print_r( $new_entry );
//exit;
-$ds = pla_ldap_connect( $server_id );
-pla_ldap_connection_is_error( $ds );
-$add_res = @ldap_mod_add( $ds, $dn, $new_entry );
+$add_res = @ldap_mod_add( $ldapserver->connect(), $dn, $new_entry );
-if( ! $add_res )
-{
- pla_error( $lang['could_not_perform_ldap_mod_add'], ldap_error( $ds ), ldap_errno( $ds ) );
-}
-else
-{
+if( ! $add_res ) {
+ pla_error( $lang['could_not_perform_ldap_mod_add'],ldap_error($ldapserver->connect()),ldap_errno($ldapserver->connect()) );
+
+} else {
header( "Location: edit.php?server_id=$server_id&dn=$encoded_dn&modified_attrs[]=objectclass" );
}
-
?>
diff --git a/add_oclass_form.php b/add_oclass_form.php
index cbe624f..766aa33 100644
--- a/add_oclass_form.php
+++ b/add_oclass_form.php
@@ -1,9 +1,7 @@
isReadOnly() )
pla_error( $lang['no_updates_in_read_only_mode'] );
+if( ! $ldapserver->haveAuthInfo())
+ pla_error( $lang['not_enough_login_info'] );
-check_server_id( $server_id ) or pla_error( $lang['bad_server_id'] );
-have_auth_info( $server_id ) or pla_error( $lang['not_enough_login_info'] );
+$new_oclass = $_REQUEST['new_oclass'];
+$dn = rawurldecode( $_REQUEST['dn'] );
+$encoded_dn = rawurlencode( $dn );
/* Ensure that the object has defined all MUST attrs for this objectClass.
* If it hasn't, present a form to have the user enter values for all the
* newly required attrs. */
-$entry = get_object_attrs( $server_id, $dn, true );
+$entry = get_object_attrs( $ldapserver, $dn, true );
+
$current_attrs = array();
foreach( $entry as $attr => $junk )
$current_attrs[] = strtolower($attr);
// grab the required attributes for the new objectClass
-$oclass = get_schema_objectclass( $server_id, $new_oclass );
+$oclass = get_schema_objectclass( $ldapserver, $new_oclass );
if( $oclass )
$must_attrs = $oclass->getMustAttrs();
+
else
$must_attrs = array();
@@ -54,52 +58,57 @@ else
// but that the object does not currently contain
$needed_attrs = array();
foreach( $must_attrs as $attr ) {
- $attr = get_schema_attribute( $server_id, $attr->getName() );
- //echo "
"; var_dump( $attr ); echo "
";
- // First, check if one of this attr's aliases is already an attribute of this entry
- foreach( $attr->getAliases() as $alias_attr_name )
- if( in_array( strtolower( $alias_attr_name ), $current_attrs ) )
- // Skip this attribute since it's already in the entry
- continue;
- if( in_array( strtolower($attr->getName()), $current_attrs ) )
- continue;
+ $attr = get_schema_attribute( $ldapserver, $attr->getName() );
- // We made it this far, so the attribute needs to be added to this entry in order
- // to add this objectClass
- $needed_attrs[] = $attr;
+ //echo "
"; var_dump( $attr ); echo "
";
+
+ // First, check if one of this attr's aliases is already an attribute of this entry
+ foreach( $attr->getAliases() as $alias_attr_name )
+ if( in_array( strtolower( $alias_attr_name ), $current_attrs ) )
+
+ // Skip this attribute since it's already in the entry
+ continue;
+
+ if( in_array( strtolower($attr->getName()), $current_attrs ) )
+ continue;
+
+ // We made it this far, so the attribute needs to be added to this entry in order
+ // to add this objectClass
+ $needed_attrs[] = $attr;
}
-if( count( $needed_attrs ) > 0 )
-{
+if( count( $needed_attrs ) > 0 ) {
include './header.php'; ?>
-
+
-
+
-
+
\n";
+ echo "\n";
foreach( $english_lang as $key => $string )
if( ! isset( $lang[ $key ] ) ) {
$has_errors = true;
diff --git a/collapse.php b/collapse.php
index 498bde5..e366b8c 100644
--- a/collapse.php
+++ b/collapse.php
@@ -1,26 +1,30 @@
haveAuthInfo())
+// pla_error( $lang['not_enough_login_info'] );
+
$dn = $_GET['dn'];
$encoded_dn = rawurlencode( $dn );
-$server_id = $_GET['server_id'];
-
-check_server_id( $server_id ) or pla_error( "Bad server_id: " . htmlspecialchars( $server_id ) );
initialize_session_tree();
@@ -35,10 +39,9 @@ $random_junk = md5( strtotime( 'now' ) . $time['usec'] );
// If cookies were disabled, build the url parameter for the session id.
// It will be append to the url to be redirect
-$id_session_param="";
-if(SID != ""){
- $id_session_param = "&".session_name()."=".session_id();
-}
+$id_session_param = "";
+if (SID != "")
+ $id_session_param = "&".session_name()."=".session_id();
header( "Location:tree.php?foo=$random_junk#{$server_id}_{$encoded_dn}$id_session_param" );
?>
diff --git a/common.php b/common.php
index 03a7dad..c26ce88 100644
--- a/common.php
+++ b/common.php
@@ -1,10 +1,11 @@
'Custom',
'icon' => 'images/object.png',
'handler' => 'custom.php' );
@@ -152,6 +162,7 @@ $templates['custom'] =
// Strip slashes from GET, POST, and COOKIE variables if this
// PHP install is configured to automatically addslashes()
if ( get_magic_quotes_gpc() && ( ! isset( $slashes_stripped ) || ! $slashes_stripped ) ) {
+ array_stripslashes($_REQUEST);
array_stripslashes($_GET);
array_stripslashes($_POST);
array_stripslashes($_COOKIE);
@@ -159,4 +170,11 @@ if ( get_magic_quotes_gpc() && ( ! isset( $slashes_stripped ) || ! $slashes_stri
$slashes_stripped = true;
}
+// Update $_SESSION[ 'activity' ]
+// for timeout and automatic logout feature
+if ( isset($_REQUEST['server_id']) ) {
+ $ldapserver = new LDAPServer($_REQUEST['server_id']);
+ if ( $ldapserver->haveAuthInfo() )
+ set_lastactivity( $ldapserver );
+}
?>
diff --git a/compare.php b/compare.php
new file mode 100644
index 0000000..3f08310
--- /dev/null
+++ b/compare.php
@@ -0,0 +1,559 @@
+haveAuthInfo())
+ pla_error( $lang['not_enough_login_info'] );
+
+$ldapserver_dst = new LDAPServer($server_id_dst);
+if( ! $ldapserver_src->haveAuthInfo())
+ pla_error( $lang['not_enough_login_info'] );
+
+dn_exists( $ldapserver_src, $dn_src ) or pla_error( sprintf( $lang['no_such_entry'], pretty_print_dn( $dn_src ) ) );
+dn_exists( $ldapserver_dst, $dn_dst ) or pla_error( sprintf( $lang['no_such_entry'], pretty_print_dn( $dn_dst ) ) );
+
+$friendly_attrs = process_friendly_attr_table();
+
+$attrs_src = get_object_attrs( $ldapserver_src, $dn_src, false, get_view_deref_setting() );
+$attrs_dst = get_object_attrs( $ldapserver_dst, $dn_dst, false, get_view_deref_setting() );
+
+# Get a list of all attributes.
+$attrs_all = array_keys($attrs_src);
+foreach ($attrs_dst as $key => $val)
+ if (! in_array($key,$attrs_all))
+ $attrs_all[] = $key;
+
+include './header.php'; ?>
+
+
+
+
+
+
+
+
+
+
: name; ?> :
+
+
+
: name; ?> :
+
+
+
+
+
+
+
+
+
(" . $lang['no_attributes'] . ")
\n";
+ echo "
";
+ echo "";
+ die();
+}
+
+sort( $attrs_all );
+
+// Work through each of the attributes.
+foreach( $attrs_all as $attr ) {
+ flush();
+
+ # If this is the DN, get the next attribute.
+ if( ! strcasecmp( $attr, 'dn' ) )
+ continue;
+
+ // Has the config.php specified that this attribute is to be hidden or shown?
+ if( is_attr_hidden( $ldapserver_src, $attr) || is_attr_hidden( $ldapserver_dst, $attr))
+ continue; ?>
+
+
+
()
+
+
+
+
+
+
+ isReadOnly() || is_attr_read_only( $ldapserver, $attr )) ) {
+ if( is_array( $vals ) ) {
+ foreach( $vals as $i => $val ) {
+ if( trim( $val ) == "" )
+ echo "[" . $lang['empty'] . "]
+
+ type == 'structural') {
+ echo "$val (" . $lang['structural'] . ")
+
+
+
+ 
+
+
+
+ 
+
+ server_id ) ) {
+
+ if ($side == 'dst') {?>
+
+
+
+
+
+
+
+
+