Changeset 21
- Timestamp:
- 05/02/07 09:15:15 (17 years ago)
- Location:
- trunk
- Files:
-
- 2 added
- 10 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/calendar/doc/change_log.txt
r2 r21 3 3 Nilton Emilio Buhrer Neto. 4 4 5 02/05/2007 - [0.9.2] 6 - Corrigindo bug que mostra todos os alarmes de um evento 7 independente do dono. Agora só mostra os eventos do dono. 8 9 30/04/2007 - [0.9.2] 10 - Ajustado o layout da versão de impressão do calendário. 5 11 6 12 27/02/2007 - [0.9.2] -
trunk/calendar/inc/class.uicalendar.inc.php
r15 r21 3390 3390 foreach($vars['participants']['data'] as $user => $str) 3391 3391 { 3392 3392 if ($this->bo->check_perms(PHPGW_ACL_EDIT,0,$user) && ereg('^(.*) \((.*)\)$',$str,$parts)) 3393 3393 { 3394 3394 $vars['participants']['data'][$user] = $parts[1].' (<a href="'.$this->page('edit_status','&cal_id='.$event['id'].'&owner='.$user).'">'.$parts[2].'</a>)'; … … 3413 3413 foreach($event['alarm'] as $key => $alarm) 3414 3414 { 3415 $icon = '<img src="'.$GLOBALS['phpgw']->common->image('calendar',($alarm['enabled']?'enabled':'disabled')).'" width="13" height="13">'; 3416 $var = Array( 3417 'field' => $icon.$GLOBALS['phpgw']->common->show_date($alarm['time']), 3418 'data' => lang('Email Notification for %1',$GLOBALS['phpgw']->common->grab_owner_name($alarm['owner'])) 3419 ); 3420 $this->output_template_array($p,'row','list',$var); 3415 if ($this->bo->so->owner == $alarm['owner']) // Show only alert from user who is requesting 3416 { 3417 $icon = '<img src="'.$GLOBALS['phpgw']->common->image('calendar',($alarm['enabled']?'enabled':'disabled')).'" width="13" height="13">'; 3418 $var = Array( 3419 'field' => $icon.$GLOBALS['phpgw']->common->show_date($alarm['time']), 3420 'data' => lang('Email Notification for %1',$GLOBALS['phpgw']->common->grab_owner_name($alarm['owner'])) 3421 ); 3422 $this->output_template_array($p,'row','list',$var); 3423 } 3421 3424 } 3422 3425 } -
trunk/calendar/templates/celepar/app_print.css
r2 r21 13 13 .button { 14 14 font-family: Verdana, Arial, Helvetica, sans-serif; 15 font-size: 1 0px;15 font-size: 12px; 16 16 color: 006699; 17 17 background-color: #D4D0C8; 18 border: 1px solid #666666;18 border: 2px solid #666666; 19 19 } -
trunk/calendar/templates/celepar/month_day.tpl
r2 r21 2 2 <!-- BEGIN m_w_table --> 3 3 4 <table id="calendar_m_w_table" class="calendar_ m_w_table" width="100%">4 <table id="calendar_m_w_table" class="calendar_print_main" border="1" width="100%"> 5 5 <! from month_header.tpl --> 6 6 {row} -
trunk/expressoMail1_2/docs/change_log.txt
r13 r21 67 67 - Corrigido problema de mensagens que têm nome de arquivos nos atributos "parameters" e "dparameters" de sua estrutura. 68 68 69 27/04/2007 - [1.2030] 70 - Implementado ocultação de usuários e grupos no expressoMail e na Calendar. -
trunk/expressoMail1_2/inc/class.ldap_functions.inc.php
r2 r21 209 209 { 210 210 $justthese = array("gidNumber","cn"); 211 $sr=ldap_list($this->ds, $user_context, ("(&(cn=*)(phpgwaccounttype=g) )"),$justthese);211 $sr=ldap_list($this->ds, $user_context, ("(&(cn=*)(phpgwaccounttype=g)(!(phpgwaccountvisible=-1)))"),$justthese); 212 212 $info = ldap_get_entries($this->ds, $sr); 213 213 for ($i=0; $i<$info["count"]; $i++) 214 214 $groups[$uids=$info[$i]["gidnumber"][0]] = Array('name' => $uids=$info[$i]["cn"][0], 'type' => g); 215 215 $justthese = array("phpgwaccountvisible","uidNumber","cn"); 216 $sr=ldap_list($this->ds, $user_context, ("(&(cn=*)(phpgwaccounttype=u)(!( cn=lista*)))"),$justthese);216 $sr=ldap_list($this->ds, $user_context, ("(&(cn=*)(phpgwaccounttype=u)(!(phpgwaccountvisible=-1)))"),$justthese); 217 217 $info = ldap_get_entries($this->ds, $sr); 218 218 for ($i=0; $i<$info["count"]; $i++) … … 252 252 $context= $params['context']; 253 253 $justthese = array("cn", "uid", "cn"); 254 $filter = "(&(phpgwaccounttype=u)(!( cn=lista*)))";254 $filter = "(&(phpgwaccounttype=u)(!(phpgwaccountvisible=-1)))"; 255 255 256 256 if ($this->ds) -
trunk/instant_messenger/inc/class.Ujabber.inc.php
r20 r21 255 255 256 256 // vCard 257 $array_vcard['FN'] = trim($arr['FN']['0']['#']) ? $arr['FN']['0']['#']: $id;258 $array_vcard['NICKNAME'] = trim($arr['NICKNAME']['0']['#']) ? $arr['NICKNAME']['0']['#']: $pJid;259 $array_vcard['ORGNAME'] = trim($arr['ORG']['0']['#']['ORGNAME']['0']['#']) ? $arr['ORG']['0']['#']['ORGNAME']['0']['#']: "";260 $array_vcard['ORGUNIT'] = trim($arr['ORG']['0']['#']['ORGUNIT']['0']['#']) ? $arr['ORG']['0']['#']['ORGUNIT']['0']['#']: "";261 $array_vcard['ROLE'] = trim($arr['ROLE']['0']['#']) ? $arr['ROLE']['0']['#']: "";262 $array_vcard['BDAY'] = trim($arr['BDAY']['0']['#']) ? $arr['BDAY']['0']['#']: "";263 $array_vcard['DESC'] = trim($arr['DESC']['0']['#']) ? $arr['DESC']['0']['#']: "";257 $array_vcard['FN'] = trim($arr['FN']['0']['#']) ? urldecode($arr['FN']['0']['#']): $id; 258 $array_vcard['NICKNAME'] = trim($arr['NICKNAME']['0']['#']) ? urldecode($arr['NICKNAME']['0']['#']) : $pJid; 259 $array_vcard['ORGNAME'] = trim($arr['ORG']['0']['#']['ORGNAME']['0']['#']) ? urldecode($arr['ORG']['0']['#']['ORGNAME']['0']['#']) : ""; 260 $array_vcard['ORGUNIT'] = trim($arr['ORG']['0']['#']['ORGUNIT']['0']['#']) ? urldecode($arr['ORG']['0']['#']['ORGUNIT']['0']['#']) : ""; 261 $array_vcard['ROLE'] = trim($arr['ROLE']['0']['#']) ? urldecode($arr['ROLE']['0']['#']) : ""; 262 $array_vcard['BDAY'] = trim($arr['BDAY']['0']['#']) ? urldecode($arr['BDAY']['0']['#']) : ""; 263 $array_vcard['DESC'] = trim($arr['DESC']['0']['#']) ? urldecode($arr['DESC']['0']['#']) : ""; 264 264 $array_vcard['JID'] = $pJid; 265 265 return $array_vcard; … … 277 277 $xmlVcard = "<iq id='$id' type='set'>"; 278 278 $xmlVcard .= "<vCard xmlns='vcard-temp'>"; 279 $xmlVcard .= "<FN> $pVcard[0]</FN>";280 $xmlVcard .= "<NICKNAME> $pVcard[1]</NICKNAME>";279 $xmlVcard .= "<FN>".urlencode($pVcard[0])."</FN>"; 280 $xmlVcard .= "<NICKNAME>".urlencode($pVcard[1])."</NICKNAME>"; 281 281 $xmlVcard .= "<ORG>"; 282 $xmlVcard .= "<ORGNAME> $pVcard[2]</ORGNAME>";283 $xmlVcard .= "<ORGUNIT> $pVcard[3]</ORGUNIT>";282 $xmlVcard .= "<ORGNAME>".urlencode($pVcard[2])."</ORGNAME>"; 283 $xmlVcard .= "<ORGUNIT>".urlencode($pVcard[3])."</ORGUNIT>"; 284 284 $xmlVcard .= "</ORG>"; 285 $xmlVcard .= "<ROLE> $pVcard[4]</ROLE>";286 $xmlVcard .= "<BDAY> $pVcard[5]</BDAY>";287 $xmlVcard .= "<DESC> $pVcard[6]</DESC>";285 $xmlVcard .= "<ROLE>".urlencode($pVcard[4])."</ROLE>"; 286 $xmlVcard .= "<BDAY>".urlencode($pVcard[5])."</BDAY>"; 287 $xmlVcard .= "<DESC>".urlencode($pVcard[6])."</DESC>"; 288 288 $xmlVcard .= "</vCard></iq>"; 289 289 -
trunk/instant_messenger/index.php
r20 r21 43 43 // Footer 44 44 $GLOBALS['phpgw']->common->phpgw_footer(); 45 46 // Language47 echo "<script src='/instant_messenger/inc/load_lang.php?".$im_version."' type='text/javascript'></script>";48 45 ?> -
trunk/instant_messenger/js/im_functions.js
r20 r21 240 240 if ( !_this.load_photo ){ 241 241 242 _this.vcard_user['VCARD_FN'] = d ata.VCARD_FN;243 _this.vcard_user['VCARD_NICKNAME'] = d ata.VCARD_NICKNAME;244 _this.vcard_user['VCARD_ORGNAME'] = d ata.VCARD_ORGNAME;245 _this.vcard_user['VCARD_ORGUNIT'] = d ata.VCARD_ORGUNIT;246 _this.vcard_user['VCARD_ROLE'] = d ata.VCARD_ROLE;247 _this.vcard_user['VCARD_BDAY'] = d ata.VCARD_BDAY;248 _this.vcard_user['VCARD_DESC'] = d ata.VCARD_DESC;249 _this.vcard_user['VCARD_JID'] = d ata.VCARD_JID;242 _this.vcard_user['VCARD_FN'] = decodeURI(data.VCARD_FN); 243 _this.vcard_user['VCARD_NICKNAME'] = decodeURI(data.VCARD_NICKNAME); 244 _this.vcard_user['VCARD_ORGNAME'] = decodeURI(data.VCARD_ORGNAME); 245 _this.vcard_user['VCARD_ORGUNIT'] = decodeURI(data.VCARD_ORGUNIT); 246 _this.vcard_user['VCARD_ROLE'] = decodeURI(data.VCARD_ROLE); 247 _this.vcard_user['VCARD_BDAY'] = decodeURI(data.VCARD_BDAY); 248 _this.vcard_user['VCARD_DESC'] = decodeURI(data.VCARD_DESC); 249 _this.vcard_user['VCARD_JID'] = decodeURI(data.VCARD_JID); 250 250 251 251 im_win.get_photo_ldap(_this.vcard_user['VCARD_JID']); -
trunk/instant_messenger/js/im_preferences.js
r20 r21 282 282 var _this = this; 283 283 IM.vcard_user['VCARD_FN'] = document.getElementById('FN').value; 284 _this.save_vcard = document.getElementById('FN').value+ ";";284 _this.save_vcard = url_encode(encodeURI(document.getElementById('FN').value)) + ";"; 285 285 IM.vcard_user['VCARD_NICKNAME'] = document.getElementById('NICKNAME').value; 286 _this.save_vcard += document.getElementById('NICKNAME').value+ ";";286 _this.save_vcard += url_encode(encodeURI(document.getElementById('NICKNAME').value)) + ";"; 287 287 var nickname = document.getElementById('span_nickname').innerHTML; 288 288 document.getElementById('span_nickname').innerHTML = (IM.vcard_user['VCARD_NICKNAME']) ? "<b> " + IM.vcard_user['VCARD_NICKNAME'].substring(0,30) + "</b>" : nickname; 289 289 IM.vcard_user['VCARD_ORGNAME'] = document.getElementById('ORGNAME').value; 290 _this.save_vcard += document.getElementById('ORGNAME').value+ ";";290 _this.save_vcard += url_encode(encodeURI(document.getElementById('ORGNAME').value)) + ";"; 291 291 IM.vcard_user['VCARD_ORGUNIT'] = document.getElementById('ORGUNIT').value; 292 _this.save_vcard += document.getElementById('ORGUNIT').value+ ";";292 _this.save_vcard += url_encode(encodeURI(document.getElementById('ORGUNIT').value)) + ";"; 293 293 IM.vcard_user['VCARD_ROLE'] = document.getElementById('ROLE').value; 294 _this.save_vcard += document.getElementById('ROLE').value+ ";";294 _this.save_vcard += url_encode(encodeURI(document.getElementById('ROLE').value)) + ";"; 295 295 IM.vcard_user['VCARD_BDAY'] = document.getElementById('BDAY').value; 296 _this.save_vcard += document.getElementById('BDAY').value+ ";";296 _this.save_vcard += url_encode(encodeURI(document.getElementById('BDAY').value)) + ";"; 297 297 IM.vcard_user['VCARD_DESC'] = document.getElementById('DESC').value; 298 _this.save_vcard += document.getElementById('DESC').value;298 _this.save_vcard += url_encode(encodeURI(document.getElementById('DESC').value)); 299 299 var message_desc = document.getElementById('span_message').innerHTML; 300 300 document.getElementById('span_message').innerHTML = (IM.vcard_user['VCARD_DESC']) ? "<b> " + IM.vcard_user['VCARD_DESC'].substring(0,30) + "</b>" : message_desc ; … … 314 314 for(var i=0; i < IM.vcard_contacts.length; i++){ 315 315 if(IM.vcard_contacts[i].jid == pJid){ 316 document.getElementById('_lbl_FN').innerHTML = IM.vcard_contacts[i].VCARD_FN;317 document.getElementById('_lbl_Nickname').innerHTML = IM.vcard_contacts[i].VCARD_NICKNAME;318 document.getElementById('_lbl_Orgunit').innerHTML = IM.vcard_contacts[i].VCARD_ORGUNIT;319 document.getElementById('_lbl_Role').innerHTML = IM.vcard_contacts[i].VCARD_ROLE;320 document.getElementById('_lbl_Birthday').innerHTML = IM.vcard_contacts[i].VCARD_BDAY;316 document.getElementById('_lbl_FN').innerHTML = decodeURI(IM.vcard_contacts[i].VCARD_FN); 317 document.getElementById('_lbl_Nickname').innerHTML = decodeURI(IM.vcard_contacts[i].VCARD_NICKNAME); 318 document.getElementById('_lbl_Orgunit').innerHTML = decodeURI(IM.vcard_contacts[i].VCARD_ORGUNIT); 319 document.getElementById('_lbl_Role').innerHTML = decodeURI(IM.vcard_contacts[i].VCARD_ROLE); 320 document.getElementById('_lbl_Birthday').innerHTML = decodeURI(IM.vcard_contacts[i].VCARD_BDAY); 321 321 return; 322 322 }
Note: See TracChangeset
for help on using the changeset viewer.