- Timestamp:
- 03/25/11 09:32:12 (13 years ago)
- Location:
- branches/2.2/calendar
- Files:
-
- 3 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/2.2/calendar/inc/class.bocalendar.inc.php
r3728 r3910 387 387 388 388 $this->so->cal->stream->lock(array("phpgw_cal_user")); 389 390 if(substr($idDelegado,-1) == 'U') { 391 $idDelegado = substr($idDelegado,0,-1); 392 } 393 389 394 $sql = "SELECT * FROM phpgw_cal_user where cal_id=$idEvento and cal_login=$idDelegado"; 390 395 -
branches/2.2/calendar/inc/class.uicalendar.inc.php
r3396 r3910 238 238 239 239 function delegate_event($params=NULL) { 240 $ldap = CreateObject('expressoMail1_2.ldap_functions');241 $delegated = $ldap->uid2uidnumber($_REQUEST['delegated']);240 //$ldap = CreateObject('expressoMail1_2.ldap_functions'); 241 //$delegated = $ldap->uid2uidnumber($_REQUEST['delegated']); 242 242 243 243 try { 244 $this->bo->delegar($_REQUEST['delegator'],$ ldap->uid2uidnumber($_REQUEST['delegated'])/*$delegated*/,$_REQUEST['event']);244 $this->bo->delegar($_REQUEST['delegator'],$_REQUEST['delegated']/*$delegated*/,$_REQUEST['event']); 245 245 header("Location: index.php?menuaction=calendar.uicalendar.day&date=".$_REQUEST['date']); 246 246 }catch(Exception $e) { -
branches/2.2/calendar/js/edit_exmail.js
r3768 r3910 34 34 } 35 35 var options = '###'; 36 if (data ) {36 if (data.users && data.users.length > 0) { 37 37 38 options += '<option value="-1" disabled>------------------- '+document.getElementById("txt_users").value+' ------------------ </option>' + data ;38 options += '<option value="-1" disabled>------------------- '+document.getElementById("txt_users").value+' ------------------ </option>' + data.users; 39 39 40 40 if(is_firefox_0) … … 51 51 52 52 document.getElementById('combo_org').value = context; 53 cExecute (path+'.ldap_functions.get_available_users 2&valueAsUidNum=1&context='+context+'&type='+type, handler_get_available_users2);53 cExecute (path+'.ldap_functions.get_available_users&context='+context+'&type='+type, handler_get_available_users2); 54 54 } 55 55
Note: See TracChangeset
for help on using the changeset viewer.