Changeset 86 for trunk/expressoAdmin1_2
- Timestamp:
- 10/19/07 10:23:42 (17 years ago)
- Location:
- trunk/expressoAdmin1_2
- Files:
-
- 4 edited
-
inc/class.group.inc.php (modified) (2 diffs)
-
inc/class.maillist.inc.php (modified) (4 diffs)
-
js/jscode/groups.js (modified) (3 diffs)
-
js/jscode/maillists.js (modified) (3 diffs)
Legend:
- Unmodified
- Added
- Removed
-
trunk/expressoAdmin1_2/inc/class.group.inc.php
r64 r86 332 332 foreach($add_users as $uidnumber) 333 333 { 334 if (is_numeric($uidnumber) )334 if (is_numeric($uidnumber) && ($uidnumber != -1)) 335 335 { 336 336 $this->db_functions->add_user2group($new_values['gidnumber'], $uidnumber); … … 352 352 foreach($remove_users as $uidnumber) 353 353 { 354 $this->db_functions->remove_user2group($new_values['gidnumber'], $uidnumber); 355 $user = $this->ldap_functions->uidnumber2uid($uidnumber); 356 $array_memberUids_remove[] = $user; 357 $this->db_functions->write_log("Removido usuário $user do grupo $dn.",$dn,'','',''); 354 if ($uidnumber != -1) 355 { 356 $this->db_functions->remove_user2group($new_values['gidnumber'], $uidnumber); 357 $user = $this->ldap_functions->uidnumber2uid($uidnumber); 358 $array_memberUids_remove[] = $user; 359 $this->db_functions->write_log("Removido usuário $user do grupo $dn.",$dn,'','',''); 360 } 358 361 } 359 362 $this->ldap_functions->remove_user2group($new_values['gidnumber'], $array_memberUids_remove); -
trunk/expressoAdmin1_2/inc/class.maillist.inc.php
r64 r86 247 247 foreach($add_users as $uidnumber) 248 248 { 249 $mail = $this->ldap_functions->uidnumber2mail($uidnumber); 250 $array_emails_add[] = $mail; 251 $this->db_functions->write_log("Adicionado usuario $mail a lista",$dn,$uidnumber,'',''); 249 if ($uidnumber != -1) 250 { 251 $mail = $this->ldap_functions->uidnumber2mail($uidnumber); 252 $array_emails_add[] = $mail; 253 $this->db_functions->write_log("Adicionado usuario $mail a lista",$dn,$uidnumber,'',''); 254 } 252 255 } 253 256 $this->ldap_functions->add_user2maillist($new_values['uidnumber'], $array_emails_add); … … 258 261 foreach($remove_users as $uidnumber) 259 262 { 260 $mail = $this->ldap_functions->uidnumber2mail($uidnumber); 263 if ($uidnumber != -1) 264 { 265 $mail = $this->ldap_functions->uidnumber2mail($uidnumber); 261 266 262 // Não achei o email do usuário no ldap.263 if (empty($mail))264 $mail = $uidnumber;267 // Não achei o email do usuário no ldap. 268 if (empty($mail)) 269 $mail = $uidnumber; 265 270 266 $array_emails_remove[] = $mail; 267 $this->db_functions->write_log("Removido usuario $mail da lista",$dn,$uidnumber,'',''); 271 $array_emails_remove[] = $mail; 272 $this->db_functions->write_log("Removido usuario $mail da lista",$dn,$uidnumber,'',''); 273 } 268 274 } 269 275 $this->ldap_functions->remove_user2maillist($new_values['uidnumber'], $array_emails_remove); … … 360 366 foreach($add_users as $uidnumber) 361 367 { 362 $mail = $this->ldap_functions->uidnumber2mail($uidnumber); 363 $array_emails_add[] = $mail; 364 $this->db_functions->write_log("Adicionado usuario $mail a SCL da lista $dn",'',$uidnumber,'',''); 368 if ($uidnumber != -1) 369 { 370 $mail = $this->ldap_functions->uidnumber2mail($uidnumber); 371 $array_emails_add[] = $mail; 372 $this->db_functions->write_log("Adicionado usuario $mail a SCL da lista $dn",'',$uidnumber,'',''); 373 } 365 374 } 366 375 $result = $this->ldap_functions->add_user2maillist_scl($dn, $array_emails_add); … … 378 387 foreach($remove_users as $uidnumber) 379 388 { 380 $mail = $this->ldap_functions->uidnumber2mail($uidnumber); 381 $array_emails_remove[] = $mail; 382 $this->db_functions->write_log("Removido usuario $mail da SCP da lista $dn",'',$uidnumber,'',''); 389 if ($uidnumber != -1) 390 { 391 $mail = $this->ldap_functions->uidnumber2mail($uidnumber); 392 $array_emails_remove[] = $mail; 393 $this->db_functions->write_log("Removido usuario $mail da SCP da lista $dn",'',$uidnumber,'',''); 394 } 383 395 } 384 396 $result = $this->ldap_functions->remove_user2maillist_scl($dn, $array_emails_remove); -
trunk/expressoAdmin1_2/js/jscode/groups.js
r81 r86 144 144 { 145 145 // Necessario, pois o IE6 tem um bug que retira o primeiro options se o innerHTML estiver vazio. 146 select_available_users.innerHTML = ' lixo' + data;146 select_available_users.innerHTML = ' ' + data; 147 147 select_available_users.outerHTML = select_available_users.outerHTML; 148 148 … … 161 161 // Limpa select 162 162 select_available_users = document.getElementById('ea_select_available_users'); 163 select_available_users.innerHTML = ' lixo';163 select_available_users.innerHTML = ' '; 164 164 select_available_users.outerHTML = select_available_users.outerHTML; 165 165 return; … … 208 208 if (new_options != '') 209 209 { 210 select_usersInGroup.innerHTML = ' lixo' + new_options + select_usersInGroup.innerHTML;210 select_usersInGroup.innerHTML = ' ' + new_options + select_usersInGroup.innerHTML; 211 211 select_usersInGroup.outerHTML = select_usersInGroup.outerHTML; 212 212 document.getElementById('ea_input_searchUser').value = ""; -
trunk/expressoAdmin1_2/js/jscode/maillists.js
r81 r86 167 167 { 168 168 // Necessario, pois o IE6 tem um bug que retira o primeiro options se o innerHTML estiver vazio. 169 select_available_users.innerHTML = ' lixo' + data;169 select_available_users.innerHTML = ' ' + data; 170 170 select_available_users.outerHTML = select_available_users.outerHTML; 171 171 … … 184 184 // Limpa select 185 185 select_available_users = document.getElementById('ea_select_available_users'); 186 select_available_users.innerHTML = ' lixo';186 select_available_users.innerHTML = ' '; 187 187 select_available_users.outerHTML = select_available_users.outerHTML; 188 188 return; … … 231 231 if (new_options != '') 232 232 { 233 select_usersInMaillist.innerHTML = ' lixo' + new_options + select_usersInMaillist.innerHTML;233 select_usersInMaillist.innerHTML = ' ' + new_options + select_usersInMaillist.innerHTML; 234 234 select_usersInMaillist.outerHTML = select_usersInMaillist.outerHTML; 235 235 document.getElementById('ea_input_searchUser').value = "";
Note: See TracChangeset
for help on using the changeset viewer.
