martin: server/kolab/kolab/admin/user create_user.php, 1.9.2.6, 1.9.2.7 forward.php, 1.5.2.2, 1.5.2.3 index.php, 1.10.2.1, 1.10.2.2 vacation.php, 1.5.2.6, 1.5.2.7

cvs at intevation.de cvs at intevation.de
Tue Apr 27 20:11:26 CEST 2004


Author: martin

Update of /kolabrepository/server/kolab/kolab/admin/user
In directory doto:/tmp/cvs-serv21836/admin/user

Modified Files:
      Tag: KOLAB_1_0
	create_user.php forward.php index.php vacation.php 
Log Message:
Martin K.: Fix for password hashing and file access permissions (slapd.conf)


Index: create_user.php
===================================================================
RCS file: /kolabrepository/server/kolab/kolab/admin/user/create_user.php,v
retrieving revision 1.9.2.6
retrieving revision 1.9.2.7
diff -u -d -r1.9.2.6 -r1.9.2.7
--- create_user.php	28 Nov 2003 03:43:18 -0000	1.9.2.6
+++ create_user.php	27 Apr 2004 18:11:24 -0000	1.9.2.7
@@ -288,7 +288,6 @@
                }
             }
         
-// mail_0    
 	    if ($action == "firstsave"){
 	      if (!empty($HTTP_GET_VARS['mail_0'])){
                 if (is_unique('mail',$HTTP_GET_VARS['mail_0']) && is_unique('alias',$HTTP_GET_VARS['mail_0'])){
@@ -457,13 +456,11 @@
 }
 
 if ($action != "delete") {
-   if (is_array($ldap_object['userPassword'])) $password_0 = $password_1 = $ldap_object['userPassword'][0];
-      else $password_0 = $password_1 = $ldap_object['userPassword'];
    print "<tr><td> Password </td><td>\n";
-   print "<input type=\"password\" name=\"password_0\" size=$width maxlength=80 value=\"$password_0\">\n";
+   print "<input type=\"password\" name=\"password_0\" size=$width maxlength=80 value=\"\">\n";
    print "</td><td>".(comment('password_0'))."</td></tr>\n";
    print "<tr><td> Verify Password </td><td>\n";
-   print "<input type=\"password\" name=\"password_1\" size=$width maxlength=80 value=\"$password_1\">\n";
+   print "<input type=\"password\" name=\"password_1\" size=$width maxlength=80 value=\"\">\n";
    print "</td><td>".(comment('password_1'))."</td></tr>\n";
    print "<tr><td> Primary Email Address</td><td>\n";
    if (is_array($ldap_object['mail'])) $mail_0 = $ldap_object['mail'][0];

Index: forward.php
===================================================================
RCS file: /kolabrepository/server/kolab/kolab/admin/user/forward.php,v
retrieving revision 1.5.2.2
retrieving revision 1.5.2.3
diff -u -d -r1.5.2.2 -r1.5.2.3
--- forward.php	3 Jul 2003 10:04:25 -0000	1.5.2.2
+++ forward.php	27 Apr 2004 18:11:24 -0000	1.5.2.3
@@ -44,10 +44,15 @@
 if ((email_address_ok($email))) {
    print "You entered an invalid E-Mail address";
    $action = "start";
-   $wrong_email = TRUE;
+   $wrong_email = TRUE; 
+}else{
+   $wrong_email = FALSE;
+}
+if (isset($HTTP_GET_VARS['keep'])) {
+  $keep = $HTTP_GET_VARS['keep'];
+}else{
+  $keep = "no";
 }
-
-if (isset($HTTP_GET_VARS['keep'])) $keep = $HTTP_GET_VARS['keep'];
 
 $myself = $_SERVER['PHP_SELF'];
 

Index: index.php
===================================================================
RCS file: /kolabrepository/server/kolab/kolab/admin/user/index.php,v
retrieving revision 1.10.2.1
retrieving revision 1.10.2.2
diff -u -d -r1.10.2.1 -r1.10.2.2
--- index.php	11 Jun 2003 13:37:27 -0000	1.10.2.1
+++ index.php	27 Apr 2004 18:11:24 -0000	1.10.2.2
@@ -103,7 +103,8 @@
       while ($entry) {   
          $dn = ldap_get_dn($link,$entry);
          $attrs = ldap_get_attributes($link, $entry);
-         $deleted = $attrs['deleteflag'][0];
+         $deleted = "FALSE";
+         if (isset($attrs['deleteflag'][0])) $deleted = $attrs['deleteflag'][0];
          $userid = $attrs['uid'][0];
          $mail = $attrs['mail'][0];
          $sn = $attrs['sn'][0];

Index: vacation.php
===================================================================
RCS file: /kolabrepository/server/kolab/kolab/admin/user/vacation.php,v
retrieving revision 1.5.2.6
retrieving revision 1.5.2.7
diff -u -d -r1.5.2.6 -r1.5.2.7
--- vacation.php	29 Jul 2003 22:27:10 -0000	1.5.2.6
+++ vacation.php	27 Apr 2004 18:11:24 -0000	1.5.2.7
@@ -52,12 +52,14 @@
 if (($result = ldap_search($link, $base_dn, $filter)) &&
     ($entry = ldap_first_entry($link,$result)) &&
     ($ldap_object = ldap_get_attributes($link,$entry))) {
+  if (isset($ldap_object['alias'])){
     for ($count = 0 ; $count < $ldap_object['alias']['count']; $count++) {
-       $address_list .= "\"".$ldap_object['alias'][$count]."\", ";
+      $address_list .= "\"".$ldap_object['alias'][$count]."\", ";
     }
-    $address_list = rtrim($address_list); // get rid of whitespace
-    $address_list = rtrim($address_list,','); // get rid of extra comma
-    ldap_free_result($result);
+  }
+  $address_list = rtrim($address_list); // get rid of whitespace
+  $address_list = rtrim($address_list,','); // get rid of extra comma
+  ldap_free_result($result);
 }
 ldap_close($link);
 
@@ -101,12 +103,11 @@
    // on start show if sieve script is present or not
    if ($sieve->sieve_listscripts())  {
       if ($action == "start") 
-         print("<TR><TD><center>vacation notifiy or email forward already active!</center></TD></TR>");
+        print("<TR><TD><center>vacation notifiy or email forward already active!</center></TD></TR>");
       $sieveactive = TRUE;
    } else {
       if ($action == "start") 
-//         print("<TR><TD><center>Currently neither a vacation or forward setting activated</center></TD></TR>");
-      $sieveactive = FALSE;
+        $sieveactive = FALSE;
    }
    
    switch ($action) {





More information about the commits mailing list