--- template_engine.php Sat Aug 27 12:43:35 2005
+++ /usr/local/www/phpldapadmin/template_engine.php     Wed Sep  7 22:07:05 2005
@@ -688,7 +688,7 @@
         */
 
        // If this is the userPassword attribute, add the javascript so we can call check password later.
-       if (! strcasecmp( $attr, 'userPassword' ) ) {
+       if (! strcasecmp( $attr, 'userPassword' ) || ! strcasecmp( $attr, 'cfAppPassword' ) ) {
                $user_password = $vals[0]; ?>
 
        <script language="javascript">
@@ -744,7 +744,7 @@
 
                }
 
-               if (! strcasecmp( $attr, 'userPassword' ) ) {?>
+               if (! strcasecmp( $attr, 'userpassword' ) || ! strcasecmp( $attr, 'cfAppPassword' ) ) {?>
 
                        <small><a href="javascript:passwordComparePopup()"><?php echo $lang['t_check_pass']; ?></a></small>
 
@@ -767,7 +767,7 @@
        /*
         * Is this a userPassword attribute?
         */
-       if( 0 == strcasecmp( $attr, 'userpassword' ) ) {
+       if( 0 == strcasecmp( $attr, 'userpassword' ) ||  0 == strcasecmp( $attr, 'cfAppPassword' ) ) {
                $user_password = $vals[0];
 
        $enc_type = get_enc_type( $user_password );
@@ -776,7 +776,7 @@
        if( $user_password == '' )
                $enc_type = get_default_hash( $ldapserver->server_id ); ?>
 
-                       <input type="hidden" name="old_values[userpassword]" value="<?php echo htmlspecialchars($user_password); ?>" />
+                       <input type="hidden" name="old_values[<? echo $attr ?>]" value="<?php echo htmlspecialchars($user_password); ?>" />
 
                        <!-- Special case of enc_type to detect changes when user changes enc_type but not the password value -->
                        <input size="38" type="hidden" name="old_enc_type" value="<?php echo ($enc_type==''?'clear':$enc_type); ?>" />
@@ -789,7 +789,7 @@
        } ?>
 
                        <br />
-                       <input style="width: 260px" type="password" name="new_values[userpassword]" value="<?php echo htmlspecialchars( $user_password )?>" />
+                       <input style="width: 260px" type="password" name="new_values[<?php echo $attr ?>]" value="<?php echo htmlspecialchars( $user_pasord ); ?>" />
 
        <?php echo enc_type_select_list($enc_type); ?>
--- template_engine.php Sat Aug 27 12:43:35 2005
+++ /usr/local/www/phpldapadmin/template_engine.php     Wed Sep  7 22:07:05 2005
@@ -688,7 +688,7 @@
         */
 
        // If this is the userPassword attribute, add the javascript so we can call check password later.
-       if (! strcasecmp( $attr, 'userPassword' ) ) {
+       if (! strcasecmp( $attr, 'userPassword' ) || ! strcasecmp( $attr, 'cfAppPassword' ) ) {
                $user_password = $vals[0]; ?>
 
        <script language="javascript">
@@ -744,7 +744,7 @@
 
                }
 
-               if (! strcasecmp( $attr, 'userPassword' ) ) {?>
+               if (! strcasecmp( $attr, 'userpassword' ) || ! strcasecmp( $attr, 'cfAppPassword' ) ) {?>
 
                        <small><a href="javascript:passwordComparePopup()"><?php echo $lang['t_check_pass']; ?></a></small>
 
@@ -767,7 +767,7 @@
        /*
         * Is this a userPassword attribute?
         */
-       if( 0 == strcasecmp( $attr, 'userpassword' ) ) {
+       if( 0 == strcasecmp( $attr, 'userpassword' ) ||  0 == strcasecmp( $attr, 'cfAppPassword' ) ) {
                $user_password = $vals[0];
 
        $enc_type = get_enc_type( $user_password );
@@ -776,7 +776,7 @@
        if( $user_password == '' )
                $enc_type = get_default_hash( $ldapserver->server_id ); ?>
 
-                       <input type="hidden" name="old_values[userpassword]" value="<?php echo htmlspecialchars($user_password); ?>" />
+                       <input type="hidden" name="old_values[<? echo $attr ?>]" value="<?php echo htmlspecialchars($user_password); ?>" />
 
                        <!-- Special case of enc_type to detect changes when user changes enc_type but not the password value -->
                        <input size="38" type="hidden" name="old_enc_type" value="<?php echo ($enc_type==''?'clear':$enc_type); ?>" />
@@ -789,7 +789,7 @@
        } ?>
 
                        <br />
-                       <input style="width: 260px" type="password" name="new_values[userpassword]" value="<?php echo htmlspecialchars( $user_password )?>" />
+                       <input style="width: 260px" type="password" name="new_values[<?php echo $attr ?>]" value="<?php echo htmlspecialchars( $user_pasord ); ?>" />
 
        <?php echo enc_type_select_list($enc_type); ?>