Changeset 9576

Show
Ignore:
Timestamp:
05/03/10 08:05:22 (3 years ago)
Author:
mbrevda
Message:

re #4147; use consecutive id's to prevent posible race conditions

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • modules/branches/2.8/directory/functions.inc.php

    r9566 r9576  
    168168  $newuser.='<option value="none" selected> == '._('Chose One').' == </option>'; 
    169169  $newuser.='<option value="all">'._('All Users').'</option>'; 
    170   $newuser.='<option value="">'._('Custom').'</option>'; 
     170  $newuser.='<option value="|">'._('Custom').'</option>'; 
    171171  foreach(core_users_list() as $user){ 
    172172    $newuser.='<option value="'.$user[0].'|'.$user[1].'">('.$user[0].') '.$user[1].'</option>'; 
    173173  } 
    174174  $newuser.='</select>'; 
    175   $html.='<tfoot><tr><td id="addbut"><a href="#" class="info"><input type="image" src="images/core_add.png" name="image" style="border:none;"><span>'._('Add new entry.').'</span></a></td><td id="addrow">'.$newuser.'</td></tr></tfoot>'; 
     175  /$html.='<tfoot><tr><td id="addbut"><a href="#" class="info"><input type="image" src="images/core_add.png" name="image" style="border:none;"><span>'._('Add new entry.').'</span></a></td><td id="addrow">'.$newuser.'</td></tr></tfoot>'; 
    176176  $html.='<tbody>'; 
    177177  $entries=directory_get_dir_entries($id); 
    …… 
    188188  global $directory_draw_recordings_list;//make global, so its only drawn once 
    189189  if(!$directory_draw_recordings_list){$directory_draw_recordings_list=recordings_list();} 
    190   if(!$id){$id=rand(100000,999999);} 
     190  if(!$id){$id=time().rand(100,999);}//probobly never used, here just in case 
    191191  $select='<select name="entries['.$id.'][audio]">'; 
    192192  $select.='<option value="vm" '.(($audio=='vm')?'SELECTED':'').'>'._('Voicemail Greeting').'</option>'; 

  • modules/branches/2.8/directory/page.directory.php

    r9566 r9576  
    4646    }); 
    4747    if($('#addusersel').val()!='none'){ 
    48       addrow($('#addusersel').val()); 
     48      var rownum=$('[class^=entrie]').length+1; 
     49      //pick anohter id if this one already exists for some reason 
     50      while($('.entrie'+rownum).length==1){ 
     51        rownum++; 
     52      } 
     53      addrow($('#addusersel').val()+'|'+rownum); 
    4954    } 
    5055    return false;