Changeset 27
- Timestamp:
- 05/25/07 17:50:27 (17 years ago)
- Location:
- trunk
- Files:
-
- 11 added
- 50 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/calendar/inc/hook_sidebox_menu.inc.php
r2 r27 32 32 'This year'=>$GLOBALS['phpgw']->link('/index.php','menuaction=calendar.uicalendar.year'), 33 33 'Group Planner'=>$GLOBALS['phpgw']->link('/index.php','menuaction=calendar.uicalendar.planner'), 34 'Daily Matrix View'=>$GLOBALS['phpgw']->link('/index.php','menuaction=calendar.uicalendar.matrixselect'),34 //'Daily Matrix View'=>$GLOBALS['phpgw']->link('/index.php','menuaction=calendar.uicalendar.matrixselect'), 35 35 '_NewLine_', // give a newline 36 36 'Import'=>$GLOBALS['phpgw']->link('/index.php','menuaction=calendar.uiicalendar.import'), -
trunk/calendar/templates/celepar/app_print.css
r24 r27 238 238 padding-right: 4px; 239 239 padding-bottom: 6px; 240 border: 1px solid #000000; 240 241 } 241 242 -
trunk/calendar/templates/celepar/header.inc.php
r2 r27 65 65 } 66 66 67 add_col($tpl,' <td width="2%" align="left">'.add_image_ahref($this->page('matrixselect'),'view',lang('Daily Matrix View')).'</td>');67 //add_col($tpl,' <td width="2%" align="left">'.add_image_ahref($this->page('matrixselect'),'view',lang('Daily Matrix View')).'</td>'); 68 68 69 69 add_col($tpl,' <td width="'.(100 - $col_width).'%" align="left"'.(floor(phpversion()) < 4?' colspan="2"':'').'> </td>'); -
trunk/calendar/templates/celepar/month_day.tpl
r24 r27 2 2 <!-- BEGIN m_w_table --> 3 3 4 <table id="calendar_m_w_table" class="calendar_m_w_table" border=" 1" width="100%">4 <table id="calendar_m_w_table" class="calendar_m_w_table" border="0" width="100%"> 5 5 <! from month_header.tpl --> 6 6 {row} -
trunk/expressoAdmin1_2/docs/change_log.txt
r24 r27 56 56 08/05/2007 57 57 - Melhorado performance ao editar listas e grupos. 58 59 22/05/2007 - [1.240] 60 - Criado possibilidade de administrar diversos domínios samba -
trunk/expressoAdmin1_2/inc/class.bocomputers.inc.php
r2 r27 59 59 $computer_info['sambaPwdLastSet'] = strtotime("now"); 60 60 $computer_info['sambaPwdMustChange'] = '2147483647'; 61 $computer_info['samba SID'] = $current_config['expressoAdmin_sambaSID'] . '-' . ((2 *$id)+1000);61 $computer_info['sambasid'] = $_POST['sambasid'] . '-' . ((2 * (int)$id)+1000); 62 62 63 63 /* Trust Account */ … … 140 140 $computer_mod_replace['sambaNTPassword'] = exec('/home/expressolivre/mkntpwd -L '.$_POST['computer_password']); 141 141 } 142 143 if ($_POST['sambasid'] != $_POST['old_sambasid']) 144 { 145 $computer_mod_replace['sambasid'] = $_POST['sambasid'] . '-' . ((2 * (int)$_POST['uidnumber'])+1000); 146 } 147 142 148 143 149 if (count($computer_mod_add) != 0) -
trunk/expressoAdmin1_2/inc/class.bomanagers.inc.php
r2 r27 41 41 'set_user_default_password' => $_POST['set_user_default_password'], 42 42 'edit_sambausers_attributes'=> $_POST['edit_sambausers_attributes'], 43 'edit_sambadomains' => $_POST['edit_sambadomains'], 43 44 'add_email_lists' => $_POST['add_maillists'], 44 45 'edit_email_lists' => $_POST['edit_maillists'], … … 61 62 $acl = $acl + $manager['add_groups'] + $manager['edit_groups'] + $manager['delete_groups']; 62 63 $acl = $acl + $manager['change_users_password'] + $manager['change_users_quote'] + $manager['set_user_default_password']; 63 $acl = $acl + $manager['edit_sambausers_attributes'] ;64 $acl = $acl + $manager['edit_sambausers_attributes'] + $manager['edit_sambadomains']; 64 65 $acl = $acl + $manager['add_email_lists'] + $manager['edit_email_lists'] + $manager['delete_email_lists']; 65 66 $acl = $acl + $manager['create_sectors'] + $manager['edit_sectors'] + $manager['delete_sectors'] + $manager['manage_wf_sectors'] + $manager['view_global_sessions']; … … 79 80 $GLOBALS['phpgw']->db->query($sql); 80 81 } 81 82 // Adiciona usuário na ACL do expressoadmin83 /*84 $accounts = CreateObject('phpgwapi.accounts');85 $manager_id = $accounts->name2id($_POST['manager_lid']);86 $sql = "INSERT INTO phpgw_acl (acl_appname, acl_location, acl_account, acl_rights) values ('expressoadmin','run','" . $manager_id . "','1')";87 $GLOBALS['phpgw']->db->query($sql);88 */89 82 90 83 //Retorna ao list managers … … 119 112 'set_user_default_password' => $_POST['set_user_default_password'], 120 113 'edit_sambausers_attributes'=> $_POST['edit_sambausers_attributes'], 114 'edit_sambadomains' => $_POST['edit_sambadomains'], 121 115 'add_email_lists' => $_POST['add_maillists'], 122 116 'edit_email_lists' => $_POST['edit_maillists'], … … 139 133 $acl = $acl + $manager['add_groups'] + $manager['edit_groups'] + $manager['delete_groups']; 140 134 $acl = $acl + $manager['change_users_password'] + $manager['change_users_quote'] + $manager['set_user_default_password']; 141 $acl = $acl + $manager['edit_sambausers_attributes'] ;135 $acl = $acl + $manager['edit_sambausers_attributes'] + $manager['edit_sambadomains']; 142 136 $acl = $acl + $manager['add_email_lists'] + $manager['edit_email_lists'] + $manager['delete_email_lists']; 143 137 $acl = $acl + $manager['create_sectors'] + $manager['edit_sectors'] + $manager['delete_sectors'] + $manager['manage_wf_sectors'] + $manager['view_global_sessions']; -
trunk/expressoAdmin1_2/inc/class.db_functions.inc.php
r13 r27 521 521 return $availableApps; 522 522 } 523 524 function get_sambadomains_list() 525 { 526 $query = "SELECT * FROM phpgw_expressoadmin_samba ORDER by samba_domain_name ASC"; 527 $this->db->query($query); 528 while($this->db->next_record()) 529 $result[] = $this->db->row(); 530 return $result; 531 } 532 533 function exist_domain_name_sid($sambadomainname, $sambasid) 534 { 535 $query = "SELECT * FROM phpgw_expressoadmin_samba WHERE samba_domain_name='$sambadomainname' OR samba_domain_sid='$sambasid'"; 536 $this->db->query($query); 537 while($this->db->next_record()) 538 $result[] = $this->db->row(); 539 540 if (count($result) > 0) 541 return true; 542 else 543 return false; 544 } 545 546 function delete_sambadomain($sambadomainname) 547 { 548 $this->db->query("DELETE FROM phpgw_expressoadmin_samba WHERE samba_domain_name='$sambadomainname'"); 549 return; 550 } 551 552 function add_sambadomain($sambadomainname, $sambasid) 553 { 554 $sql = "INSERT INTO phpgw_expressoadmin_samba (samba_domain_name, samba_domain_sid) VALUES('$sambadomainname','$sambasid')"; 555 $this->db->query($sql); 556 return; 557 } 523 558 } 524 559 ?> -
trunk/expressoAdmin1_2/inc/class.functions.inc.php
r23 r27 78 78 return true; 79 79 break; 80 case edit_sambadomains: 81 if ($array_acl[edit_sambadomains]) 82 return true; 83 break; 80 84 81 85 case list_groups: … … 201 205 $array_acl['set_user_default_password'] = $acl & 524288; 202 206 $array_acl['edit_sambausers_attributes'] = $acl & 32768; 207 $array_acl['edit_sambadomains'] = $acl & 16777216; 203 208 $array_acl['add_maillists'] = $acl & 256; 204 209 $array_acl['edit_maillists'] = $acl & 512; -
trunk/expressoAdmin1_2/inc/class.ldap_functions.inc.php
r24 r27 640 640 $result['sambalogonscript'] = $entry[0]['sambalogonscript'][0]; 641 641 $result['homedirectory'] = $entry[0]['homedirectory'][0]; 642 $a_tmp = explode("-", $entry[0]['sambasid'][0]); 643 array_pop($a_tmp); 644 $result['sambasid'] = implode("-", $a_tmp); 642 645 } 643 646 … … 1160 1163 function rename_departmentnumber($old_dp, $new_dp) 1161 1164 { 1162 1163 1165 $return['status'] = true; 1164 1165 1166 1166 1167 $justthese = array("dn"); … … 1183 1184 return $return; 1184 1185 } 1186 1187 function add_sambadomain($sambadomainname, $sambasid, $context) 1188 { 1189 $result = array(); 1190 1191 $dn = "sambaDomainName=$sambadomainname,$context"; 1192 $entry['sambaSID'] = $sambasid; 1193 $entry['objectClass'] = 'sambaDomain'; 1194 $entry['sambaAlgorithmicRidBase'] = '1000'; 1195 $entry['sambaDomainName'] = $sambadomainname; 1196 1197 if (!@ldap_add ( $this->ldap, $dn, $entry )) 1198 { 1199 $return['status'] = false; 1200 $return['msg'] = "Erro na funcao ldap_functions->add_sambadomain ($dn).\nRetorno do servidor: " . ldap_error($this->ldap); 1201 } 1202 else 1203 $return['status'] = true; 1204 1205 return $return; 1206 } 1207 1208 function delete_sambadomain($sambadomainname) 1209 { 1210 $return['status'] = true; 1211 $filter="(sambaDomainName=$sambadomainname)"; 1212 $search = ldap_search($this->ldap, $GLOBALS['phpgw_info']['server']['ldap_context'], $filter); 1213 $entry = ldap_get_entries($this->ldap, $search); 1214 1215 if ($entry['count'] != 0) 1216 { 1217 $dn = $entry[0]['dn']; 1218 1219 if (!@ldap_delete($this->ldap, $dn)) 1220 { 1221 $return['status'] = false; 1222 $return['msg'] .= "Erro em ldap_funcitons->delete_sambadomain ($sambadomainname).\nRetorno do servidor: " . ldap_error($this->ldap); 1223 } 1224 } 1225 1226 return $return; 1227 } 1185 1228 } 1186 1229 ?> -
trunk/expressoAdmin1_2/inc/class.socomputers.inc.php
r2 r27 71 71 $computer_data['context'] = substr($computer_data['context'],0,(strlen($computer_data['context']) - 1)); 72 72 73 $a_tmp = explode("-", $result[0]['sambasid'][0]); 74 array_pop($a_tmp); 75 $computer_data['sambasid'] = implode("-", $a_tmp); 76 73 77 return $computer_data; 74 78 } -
trunk/expressoAdmin1_2/inc/class.uiaccounts.inc.php
r23 r27 206 206 $applications_list = $this->functions->make_list_app($manager_lid, $manager_context, $app_list); 207 207 208 // Cria combo de dominio samba 209 if ($this->current_config['expressoAdmin_samba_support'] == 'true') 210 { 211 $a_sambadomains = $this->db_functions->get_sambadomains_list(); 212 $sambadomainname_options = ''; 213 if (count($a_sambadomains)) 214 { 215 foreach ($a_sambadomains as $a_sambadomain) 216 { 217 $sambadomainname_options .= "<option value='" . $a_sambadomain['samba_domain_sid'] . "'>" . $a_sambadomain['samba_domain_name'] . "</option>"; 218 } 219 } 220 } 221 208 222 // Valores default. 209 223 $var = Array( … … 213 227 'manager_context' => $manager_context, 214 228 'type' => 'create_user', 215 //'action' => $GLOBALS['phpgw']->link('/index.php','menuaction=expressoAdmin1_2.uiaccounts.validade_user_data_add'),216 //'action' => $GLOBALS['phpgw']->link('/index.php','menuaction=expressoAdmin1_2.boaccounts.create_user'),217 229 'back_url' => $GLOBALS['phpgw']->link('/index.php','menuaction=expressoAdmin1_2.uiaccounts.list_users'), 218 230 'display_samba_suport' => $this->current_config['expressoAdmin_samba_support'] == 'true' ? '' : 'display:none', … … 285 297 //SAMBA ABA 286 298 'lang_samba_config' => lang('Samba Config'), 287 'lang_use_attrs_samba' => 'Usar atributos Samba', 299 'lang_use_attrs_samba' => lang('Use samba attributes'), 300 'lang_sambadomain' => lang('Domain'), 288 301 'lang_sambaAcctFlags' => lang('AcctFlags'), 289 302 'lang_sambaLogonScript' => lang('Logon Script'), … … 292 305 'lang_desactive_user' => lang('Samba User Desactive'), 293 306 'use_attrs_samba_checked' => 'CHECKED', 307 'sambadomainname_options' => $sambadomainname_options, 294 308 'sambalogonscript' => $this->current_config['expressoAdmin_defaultLogonScript'] != '' ? $this->current_config['expressoAdmin_defaultLogonScript'] : '', 295 309 'use_suggestion_in_logon_script' => $this->current_config['expressoAdmin_defaultLogonScript'] == '' ? 'true' : 'false', … … 328 342 $disabled_samba = ''; 329 343 } 344 // TOTAIS MENOS O SAMBA 345 if (($this->functions->check_acl($manager_account_lid,'edit_users')) && (!$this->functions->check_acl($manager_account_lid,'edit_sambausers_attributes'))) 346 { 347 $disabled = ''; 348 $disabled_password = ''; 349 $disabled_samba = 'disabled'; 350 } 330 351 // TOTAIS 331 if ($this->functions->check_acl($manager_account_lid,'edit_users'))352 elseif ($this->functions->check_acl($manager_account_lid,'edit_users')) 332 353 { 333 354 $disabled = ''; … … 453 474 $photo_bin = $GLOBALS['phpgw_info']['server']['webserver_url'] . '/expressoAdmin1_2/templates/default/images/photo_celepar.png'; 454 475 $disabled_delete_photo = 'disabled'; 476 } 477 478 // Cria combo de dominios do samba 479 if ($this->current_config['expressoAdmin_samba_support'] == 'true') 480 { 481 $a_sambadomains = $this->db_functions->get_sambadomains_list(); 482 $sambadomainname_options = ''; 483 if (count($a_sambadomains)) 484 { 485 foreach ($a_sambadomains as $a_sambadomain) 486 { 487 if ($a_sambadomain['samba_domain_sid'] == $user_info['sambasid']) 488 $sambadomainname_options .= "<option value='" . $a_sambadomain['samba_domain_sid'] . "' SELECTED>" . $a_sambadomain['samba_domain_name'] . "</option>"; 489 else 490 $sambadomainname_options .= "<option value='" . $a_sambadomain['samba_domain_sid'] . "'>" . $a_sambadomain['samba_domain_name'] . "</option>"; 491 } 492 } 455 493 } 456 494 … … 556 594 //SAMBA ABA 557 595 'lang_samba_config' => lang('Samba Config'), 558 'lang_use_attrs_samba' => 'Usar atributos Samba', 596 'lang_use_attrs_samba' => lang('Use samba attributes'), 597 'lang_sambadomain' => lang('Domain'), 559 598 'lang_sambaAcctFlags' => lang('AcctFlags'), 560 599 'lang_sambaLogonScript' => lang('Logon Script'), … … 564 603 565 604 'userSamba' => $user_info['sambaUser'], 605 'sambadomainname_options' => $sambadomainname_options, 566 606 'use_attrs_samba_checked' => $user_info['sambaUser'] ? 'CHECKED' : '', 567 607 'active_user_selected' => $user_info['sambaaccflags'] == '[U ]' ? 'selected' : '', -
trunk/expressoAdmin1_2/inc/class.uicomputers.inc.php
r2 r27 26 26 var $nextmatchs; 27 27 var $functions; 28 var $current_config; 29 var $db_functions; 28 30 29 31 function uicomputers() … … 33 35 $this->so = $this->bo->so; 34 36 $this->functions = $this->bo->functions; 37 $this->db_functions = CreateObject('expressoAdmin1_2.db_functions'); 38 39 $c = CreateObject('phpgwapi.config','expressoAdmin1_2'); 40 $c->read_repository(); 41 $this->current_config = $c->config_data; 35 42 } 36 43 … … 187 194 $sectors = $this->functions->get_organizations($context, trim(strtolower($_POST['sector_context']))); 188 195 196 // Cria combo de dominio samba 197 if ($this->current_config['expressoAdmin_samba_support'] == 'true') 198 { 199 $a_sambadomains = $this->db_functions->get_sambadomains_list(); 200 $sambadomainname_options = ''; 201 if (count($a_sambadomains)) 202 { 203 foreach ($a_sambadomains as $a_sambadomain) 204 { 205 $sambadomainname_options .= "<option value='" . $a_sambadomain['samba_domain_sid'] . "'>" . $a_sambadomain['samba_domain_name'] . "</option>"; 206 } 207 } 208 } 209 189 210 // Seta variaveis utilizadas pelo tpl. 190 211 $var = Array( … … 200 221 'lang_save' => lang('save'), 201 222 'lang_sectors' => lang('Sectors'), 223 'lang_sambadomain' => lang('Domain'), 224 202 225 'lang_computer_cn' => lang('Computer UID'), 203 226 'lang_computer_description' => lang('Description'), … … 211 234 212 235 'display_tr_computer_password' => $_POST['sambaAcctFlags'] == '[I ]' ? '' : 'display:none', 236 237 'sambadomainname_options' => $sambadomainname_options, 213 238 214 239 // Retorna os valores, quando da um erro na validação. … … 300 325 //O POST esta vazio, oq indica que precisamos recuperar os dados do computador no ldap. 301 326 if ($_POST['try_saved'] != 'true') 302 { 327 { 303 328 $uidnumber = $_GET['uidnumber']; 304 329 $computer_data = $this->so->get_computer_data($uidnumber, $manager_context); … … 306 331 // Pega combo das organizações e seleciona um dos setores em caso de um erro na validaçao dos dados. 307 332 $sectors = $this->functions->get_organizations($manager_context, trim(strtolower($computer_data['context']))); 333 334 // Cria combo de dominios do samba 335 if ($this->current_config['expressoAdmin_samba_support'] == 'true') 336 { 337 $a_sambadomains = $this->db_functions->get_sambadomains_list(); 338 $sambadomainname_options = ''; 339 if (count($a_sambadomains)) 340 { 341 foreach ($a_sambadomains as $a_sambadomain) 342 { 343 if ($a_sambadomain['samba_domain_sid'] == $computer_data['sambasid']) 344 $sambadomainname_options .= "<option value='" . $a_sambadomain['samba_domain_sid'] . "' SELECTED>" . $a_sambadomain['samba_domain_name'] . "</option>"; 345 else 346 $sambadomainname_options .= "<option value='" . $a_sambadomain['samba_domain_sid'] . "'>" . $a_sambadomain['samba_domain_name'] . "</option>"; 347 } 348 } 349 } 308 350 309 351 // Salva valores antigos … … 315 357 'old_computer_description' => $computer_data['computer_description'], 316 358 'old_computer_context' => $computer_data['context'], 359 'old_sambasid' => $computer_data['sambasid'], 317 360 318 361 'row_on' => "#DDDDDD", … … 322 365 'lang_save' => lang('save'), 323 366 'lang_sectors' => lang('Sectors'), 367 'lang_sambadomain' => lang('Domain'), 324 368 'lang_computer_cn' => lang('Computer UID'), 325 369 'lang_computer_description' => lang('Description'), … … 337 381 'computer_description' => $computer_data['computer_description'], 338 382 'combo_sectors' => $sectors, 383 'sambadomainname_options' => $sambadomainname_options, 339 384 340 385 // LINKS … … 368 413 $sectors = $this->functions->get_organizations($manager_context, trim(strtolower($_POST['sector_context']))); 369 414 415 // Cria combo de dominios do samba 416 if ($this->current_config['expressoAdmin_samba_support'] == 'true') 417 { 418 $a_sambadomains = $this->db_functions->get_sambadomains_list(); 419 $sambadomainname_options = ''; 420 if (count($a_sambadomains)) 421 { 422 foreach ($a_sambadomains as $a_sambadomain) 423 { 424 if ($a_sambadomain['samba_domain_sid'] == $_POST['sambasid']) 425 $sambadomainname_options .= "<option value='" . $a_sambadomain['samba_domain_sid'] . "' SELECTED>" . $a_sambadomain['samba_domain_name'] . "</option>"; 426 else 427 $sambadomainname_options .= "<option value='" . $a_sambadomain['samba_domain_sid'] . "'>" . $a_sambadomain['samba_domain_name'] . "</option>"; 428 } 429 } 430 } 431 370 432 $var = Array( 371 433 // LINKS … … 379 441 'lang_save' => lang('save'), 380 442 'lang_sectors' => lang('Sectors'), 443 'lang_sambadomain' => lang('Domain'), 381 444 'lang_computer_cn' => lang('Computer UID'), 382 445 'lang_computer_description' => lang('Description'), … … 398 461 'computer_description' => $_POST['computer_description'], 399 462 'combo_sectors' => $sectors, 463 'sambadomainname_options' => $sambadomainname_options, 400 464 401 465 // Valores que devem ser mantidos, aqui sao referenciados como old. … … 405 469 'old_computer_description' => $_POST['old_computer_description'], 406 470 'old_computer_context' => $_POST['old_computer_context'], 471 'old_sambasid' => $_POST['sambasid'] 407 472 ); 408 473 $p->set_var($var); -
trunk/expressoAdmin1_2/inc/class.uimanagers.inc.php
r2 r27 213 213 'lang_set_user_default_password'=> lang('Set default users password'), 214 214 'lang_edit_sambausers_attributes'=> lang('Edit SAMBA users attributes'), 215 'lang_edit_sambadomains' => lang('Edit SAMBA domains'), 215 216 'lang_add_email_lists' => lang('Add email lists'), 216 217 'lang_edit_email_lists' => lang('Edit email lists'), … … 237 238 'change_users_quote' => $_POST['change_users_quote'] != '' ? 'checked' : '', 238 239 'set_user_default_password' => $_POST['set_user_default_password'] != '' ? 'checked' : '', 240 'edit_sambausers_attributes' => $_POST['edit_sambausers_attributes'] != '' ? 'checked' : '', 241 'edit_sambadomains' => $_POST['edit_sambadomains'] != '' ? 'checked' : '', 239 242 'add_maillists' => $_POST['add_maillists'] != '' ? 'checked' : '', 240 243 'edit_maillists' => $_POST['edit_maillists'] != '' ? 'checked' : '', … … 337 340 $_POST['set_user_default_password'] = $acl['set_user_default_password']; 338 341 $_POST['edit_sambausers_attributes'] = $acl['edit_sambausers_attributes']; 342 $_POST['edit_sambadomains'] = $acl['edit_sambadomains']; 339 343 $_POST['add_maillists'] = $acl['add_maillists']; 340 344 $_POST['edit_maillists'] = $acl['edit_maillists']; … … 453 457 'lang_set_user_default_password'=> lang('Set default user password'), 454 458 'lang_edit_sambausers_attributes'=> lang('Edit SAMBA users attributes'), 459 'lang_edit_sambadomains' => lang('Edit SAMBA domains'), 455 460 'lang_add_email_lists' => lang('Add email lists'), 456 461 'lang_edit_email_lists' => lang('Edit email lists'), … … 480 485 'set_user_default_password' => $_POST['set_user_default_password'] != '' ? 'checked' : '', 481 486 'edit_sambausers_attributes' => $_POST['edit_sambausers_attributes'] != '' ? 'checked' : '', 487 'edit_sambadomains' => $_POST['edit_sambadomains'] != '' ? 'checked' : '', 482 488 'add_maillists' => $_POST['add_maillists'] != '' ? 'checked' : '', 483 489 'edit_maillists' => $_POST['edit_maillists'] != '' ? 'checked' : '', -
trunk/expressoAdmin1_2/inc/class.user.inc.php
r16 r27 58 58 59 59 // Cria array para incluir no LDAP 60 $dn = 'uid=' . $params['uid'] . ',' . $params['context']; 60 $dn = 'uid=' . $params['uid'] . ',' . $params['context']; 61 61 62 62 $user_info = array(); … … 117 117 { 118 118 $user_info['objectClass'][] = 'sambaSamAccount'; 119 120 119 $user_info['loginShell'] = '/bin/bash'; 121 $user_info['sambaSID'] = $this->current_config['expressoAdmin_sambaSID'] . '-' . ((2 * $id)+1000); 122 $user_info['sambaPrimaryGroupSID'] = $this->current_config['expressoAdmin_sambaSID'] . '-' . ((2 * $user_info['gidNumber'])+1001); 120 121 //$user_info['sambaSID'] = $this->current_config['expressoAdmin_sambaSID'] . '-' . ((2 * $id)+1000); 122 //$user_info['sambaPrimaryGroupSID'] = $this->current_config['expressoAdmin_sambaSID'] . '-' . ((2 * $user_info['gidNumber'])+1001); 123 $user_info['sambaSID'] = $params['sambadomain'] . '-' . ((2 * $id)+1000); 124 $user_info['sambaPrimaryGroupSID'] = $params['sambadomain'] . '-' . ((2 * $user_info['gidNumber'])+1001); 125 123 126 $user_info['sambaAcctFlags'] = $params['sambaacctflags']; 124 127 … … 326 329 { 327 330 $ldap_mod_replace['homedirectory'] = $new_values['sambahomedirectory']; 328 $this->db_functions->write_log("alterado homedirectory do usuario",'',$dn,'',''); 331 $this->db_functions->write_log("alterado homedirectory do usuario",'',$dn,'',''); 332 } 333 if ($diff['sambadomain']) 334 { 335 $ldap_mod_replace['sambaSID'] = $diff['sambadomain'] . '-' . ((2 * $old_values['uidnumber'])+1000); 336 $ldap_mod_replace['sambaPrimaryGroupSID'] = $diff['sambadomain'] . '-' . ((2 * $old_values['gidnumber'])+1001); 337 $this->db_functions->write_log("alterado dominio samba do usuario $dn para " . $params['sambadomain'],'',$dn,'',''); 329 338 } 330 339 } -
trunk/expressoAdmin1_2/index.php
r16 r27 38 38 'lang_email_lists' => lang('Email Lists'), 39 39 'lang_computers' => lang('Computers'), 40 'lang_sambadomains' => lang('Samba Domains'), 40 41 'lang_sectors' => lang('Sectors'), 41 42 'lang_show_sessions' => lang('Show Sessions'), -
trunk/expressoAdmin1_2/js/jscode/users.js
r13 r27 485 485 } 486 486 } 487 488 document.forms[0].sambaacctflags.disabled = !value; 489 document.forms[0].sambalogonscript.disabled = !value; 490 document.forms[0].sambahomedirectory.disabled = !value; 487 488 if (!document.forms[0].use_attrs_samba.disabled) 489 { 490 document.forms[0].sambaacctflags.disabled = !value; 491 document.forms[0].sambadomain.disabled = !value; 492 document.forms[0].sambalogonscript.disabled = !value; 493 document.forms[0].sambahomedirectory.disabled = !value; 494 } 491 495 } 492 496 -
trunk/expressoAdmin1_2/setup/setup.inc.php
r2 r27 12 12 $setup_info['expressoAdmin1_2']['name'] = 'expressoAdmin1_2'; 13 13 $setup_info['expressoAdmin1_2']['title'] = 'ExpressoAdmin 1.2'; 14 $setup_info['expressoAdmin1_2']['version'] = '1.2 21';14 $setup_info['expressoAdmin1_2']['version'] = '1.240'; 15 15 $setup_info['expressoAdmin1_2']['app_order'] = 1; 16 16 $setup_info['expressoAdmin1_2']['tables'][] = 'phpgw_expressoadmin'; … … 18 18 $setup_info['expressoAdmin1_2']['tables'][] = 'phpgw_expressoadmin_passwords'; 19 19 $setup_info['expressoAdmin1_2']['tables'][] = 'phpgw_expressoadmin_log'; 20 $setup_info['expressoAdmin1_2']['tables'][] = 'phpgw_expressoadmin_samba'; 20 21 $setup_info['expressoAdmin1_2']['enable'] = 1; 21 22 -
trunk/expressoAdmin1_2/setup/tables_current.inc.php
r2 r27 60 60 'ix' => array(), 61 61 'uc' => array() 62 ), 63 64 'phpgw_expressoadmin_samba',array( 65 'fd' => array( 66 'samba_domain_name' => array( 'type' => 'varchar', 'precision' => 50), 67 'samba_domain_sid' => array( 'type' => 'varchar', 'precision' => 100) 68 ), 69 'pk' => array('samba_domain_name'), 70 'fk' => array(), 71 'ix' => array(), 72 'uc' => array() 62 73 ) 63 74 ); -
trunk/expressoAdmin1_2/templates/default/accounts_form.tpl
r9 r27 274 274 <div id="tabcontent6" class="inactivetab" style="{display_samba_suport}"> 275 275 <table width="60%" border="0" cellspacing="4" cellpading="0"> 276 <tr bgcolor={row_o ff}>276 <tr bgcolor={row_on}> 277 277 <td>{lang_use_attrs_samba}:</td> 278 278 <td><input {use_attrs_samba_checked} {disabled_samba} name="use_attrs_samba" type="checkbox" id="use_attrs_samba" onChange="javascript:use_samba_attrs(this.checked)"></td> 279 279 </tr> 280 <tr bgcolor={row_o n}>280 <tr bgcolor={row_off}> 281 281 <td>{lang_sambaAcctFlags}:</td> 282 282 <td> … … 287 287 </td> 288 288 </tr> 289 <tr bgcolor={row_on}> 290 <td>{lang_sambadomain}:</td> 291 <td> 292 <select {disabled_samba} name="sambadomain"> 293 {sambadomainname_options} 294 </select> 295 </td> 296 </tr> 289 297 <tr bgcolor={row_off}> 290 298 <td>{lang_sambaLogonScript}:</td> 291 <td><input {disabled_samba} type="text" name="sambalogonscript" autocomplete="off" value="{sambalogonscript}" size= 30></td>299 <td><input {disabled_samba} type="text" name="sambalogonscript" autocomplete="off" value="{sambalogonscript}" size="30"></td> 292 300 </tr> 293 301 <tr bgcolor={row_on}> 294 302 <td>{lang_sambaHomeDirectory}:</td> 295 <td><input {disabled_samba} type="text" name="sambahomedirectory" autocomplete="off" value="{sambahomedirectory}" size=30></td> 303 <td> 304 <input {disabled_samba} type="text" name="sambahomedirectory" autocomplete="off" value="{sambahomedirectory}" size="30"> 305 </td> 296 306 </tr> 297 307 </table> -
trunk/expressoAdmin1_2/templates/default/computers_form.tpl
r2 r27 16 16 <input type="hidden" name="old_computer_sambaAcctFlags" value="{old_computer_sambaAcctFlags}"> 17 17 <input type="hidden" name="old_computer_description" value="{old_computer_description}"> 18 <input type="hidden" name="old_sambasid" value="{old_sambasid}"> 18 19 <tr> 19 20 <td colspan="2" align="right" bgcolor="{color_bg1}"> … … 37 38 </td> 38 39 </tr> 40 41 <tr bgcolor={row_off}> 42 <td>{lang_sambadomain}:</td> 43 <td> 44 <select {disabled_samba} name="sambasid"> 45 {sambadomainname_options} 46 </select> 47 </td> 48 </tr> 39 49 40 50 <tr bgcolor={row_off}> … … 56 66 </td> 57 67 </tr> 68 58 69 <tr id="tr_computer_password" bgcolor={row_on} style="{display_tr_computer_password}"> 59 70 <td width="25%">{lang_computer_password}:</td> … … 62 73 </td> 63 74 </tr> 64 <tr bgcolor={row_o ff}>75 <tr bgcolor={row_on}> 65 76 <td width="25%">{lang_computer_description}:</td> 66 77 <td> -
trunk/expressoAdmin1_2/templates/default/config.tpl
r23 r27 18 18 </select> 19 19 </td> 20 </tr>21 <tr class="row_off">22 <td>{lang_SambaSID}:</td>23 <td><input name="newsettings[expressoAdmin_sambaSID]" value="{value_expressoAdmin_sambaSID}" size="60" /></td>24 20 </tr> 25 21 <tr class="row_on"> -
trunk/expressoAdmin1_2/templates/default/index.tpl
r2 r27 33 33 </td> 34 34 </tr> 35 <tr style={display_samba_suport}> 36 <td width="1%" align="center"> 37 <img src='./templates/default/images/computer.png'> 38 </td> 39 <td> 40 <a href="../index.php?menuaction=expressoAdmin1_2.uidomains.list_domains">{lang_sambadomains}</a> 41 </td> 42 </tr> 35 43 <tr> 36 44 <td width="1%" align="center"> -
trunk/expressoAdmin1_2/templates/default/managers_form.tpl
r2 r27 85 85 <td><input type="checkbox" name="set_user_default_password" value="524288" {set_user_default_password}></td> 86 86 </tr> 87 88 <tr><td> </td></tr> 87 89 <tr bgcolor="{color_font1}" align='right'> 88 90 <td style="{display_samba_suport}">{lang_edit_sambausers_attributes}:</td> 89 91 <td style="{display_samba_suport}"><input type="checkbox" name="edit_sambausers_attributes" value="32768" {edit_sambausers_attributes}></td> 92 </tr> 93 <tr bgcolor="{color_font2}" align='right'> 94 <td style="{display_samba_suport}">{lang_edit_sambadomains}:</td> 95 <td style="{display_samba_suport}"><input type="checkbox" name="edit_sambadomains" value="16777216" {edit_sambadomains}></td> 90 96 </tr> 91 97 <tr><td> </td></tr> -
trunk/expressoMail1_2/docs/change_log.txt
r25 r27 73 73 10/05/2007 - [1.2031] 74 74 - Mensagens plain com subtype = "mixed", com anexo, estavam sendo abertas no corpo da mensagem. 75 - Correção de todas as chamadas da função imap_open, para não gerar erro com conexões não assinadas "/notls/novalidate-cert" 76 - Implementado Busca Rápida de Detalhes do Remetente da Mensagem, se no Contato Pessoal e Geral. -
trunk/expressoMail1_2/inc/class.db_functions.inc.php
r2 r27 210 210 return "OK!"; 211 211 } 212 function getUserByEmail($params){ 213 // Follow the referral 214 $email = $params['email']; 215 $query = 'select A.names_ordered, C.connection_name, C.connection_value, A.photo'. 216 ' from phpgw_cc_contact A, phpgw_cc_contact_conns B, '. 217 'phpgw_cc_connections C where A.id_contact = B.id_contact'. 218 ' and B.id_connection = C.id_connection and A.id_contact ='. 219 '(select A.id_contact from phpgw_cc_contact A, phpgw_cc_contact_conns B,'. 220 'phpgw_cc_connections C where A.id_contact = B.id_contact'. 221 ' and B.id_connection = C.id_connection and A.id_owner = '.$this -> user_id. 222 ' and C.connection_value = \''.$email.'\') and '. 223 'C.connection_is_default = true and B.id_typeof_contact_connection = 2'; 224 225 if (!$this->db->query($query)) 226 return null; 227 228 229 if($this->db->next_record()) { 230 $result = $this->db->row(); 231 232 $obj = array("cn" => $result['names_ordered'], 233 "email" => $email, 234 "type" => "personal", 235 "telefone" => $result['connection_value']); 236 237 if($result['photo']) 238 $_SESSION['phpgw_info']['expressomail']['contact_photo'] = array($result['photo']); 239 240 return $obj; 241 } 242 return $result; 243 } 212 244 } 213 245 ?> -
trunk/expressoMail1_2/inc/class.ldap_functions.inc.php
r21 r27 323 323 } 324 324 } 325 326 function getUserByEmail($params){ 327 // Follow the referral 328 $email = $params['email']; 329 $this->ldapConnect(true); 330 if ($this->ds) 331 { 332 $filter="(&(phpgwAccountType=u)(mail=$email))"; 333 $justthese = array("cn","telephoneNumber","jpegPhoto"); 334 $sr=ldap_search($this->ds, $this->ldap_context, $filter, $justthese); 335 $entry = ldap_first_entry($this->ds, $sr); 336 if($entry) { 337 $obj = array("cn" => @ldap_get_values($this->ds, $entry, "cn"), 338 "email" => $email, 339 "type" => "global", 340 "telefone" => @ldap_get_values($this->ds, $entry, "telephonenumber")); 341 342 $_SESSION['phpgw_info']['expressomail']['contact_photo'] = @ldap_get_values_len($this->ds, $entry, "jpegphoto"); 343 ldap_close($this->ds); 344 return $obj; 345 } 346 } 347 return null; 348 } 325 349 } 326 350 ?> -
trunk/expressoMail1_2/inc/class.phpmailer.php
r19 r27 529 529 $password = $_SESSION['phpgw_info']['expressomail']['user']['passwd']; 530 530 $imap_server = $_SESSION['phpgw_info']['expressomail']['email_server']['imapServer']; 531 $imap_port = $_SESSION['phpgw_info']['expressomail']['email_server']['imapPort']; 532 $mbox_stream = imap_open("{".$imap_server.":".$imap_port."}".$this->SaveMessageInFolder, $username, $password); 531 $imap_port = $_SESSION['phpgw_info']['expressomail']['email_server']['imapPort']; 532 533 if ($_SESSION['phpgw_info']['expressomail']['email_server']['imapTLSEncryption'] == 'yes') 534 { 535 $imap_options = '/tls/novalidate-cert'; 536 } 537 else 538 { 539 $imap_options = '/notls/novalidate-cert'; 540 } 541 $mbox_stream = imap_open("{".$imap_server.":".$imap_port.$imap_options."}".$this->SaveMessageInFolder, $username, $password); 533 542 534 543 $new_header = str_replace("\n", "\r\n", $header); -
trunk/expressoMail1_2/inc/gotodownload.php
r5 r27 13 13 $imap_server = $_SESSION['phpgw_info']['expressomail']['email_server']['imapServer']; 14 14 $imap_port = $_SESSION['phpgw_info']['expressomail']['email_server']['imapPort']; 15 16 $mbox_stream = imap_open("{".$imap_server.":".$imap_port."}".$msg_folder, $username, $password); 15 if ($_SESSION['phpgw_info']['expressomail']['email_server']['imapTLSEncryption'] == 'yes') 16 { 17 $imap_options = '/tls/novalidate-cert'; 18 } 19 else 20 { 21 $imap_options = '/notls/novalidate-cert'; 22 } 23 $mbox_stream = imap_open("{".$imap_server.":".$imap_port.$imap_options."}".$msg_folder, $username, $password); 17 24 $fileContent = imap_fetchbody($mbox_stream, $msg_number, $msg_part, FT_UID); 18 25 include("class.imap_attachment.inc.php"); -
trunk/expressoMail1_2/inc/show_embedded_attach.php
r2 r27 5 5 $imap_port = $_SESSION['phpgw_info']['expressomail']['email_server']['imapPort']; 6 6 $msg_folder = $_GET['msg_folder']; 7 $mb = imap_open("{".$imap_server.":".$imap_port."}".$msg_folder, $username, $password); 7 if ($_SESSION['phpgw_info']['expressomail']['email_server']['imapTLSEncryption'] == 'yes') 8 { 9 $imap_options = '/tls/novalidate-cert'; 10 } 11 else 12 { 13 $imap_options = '/notls/novalidate-cert'; 14 } 15 $mb = imap_open("{".$imap_server.":".$imap_port.$imap_options."}".$msg_folder, $username, $password); 8 16 9 17 $msgno = $_GET['msg_num']; -
trunk/expressoMail1_2/inc/show_img.php
r2 r27 1 1 <?php 2 $username = $_SESSION['phpgw_info']['expressomail']['user']['userid']; 3 $password = $_SESSION['phpgw_info']['expressomail']['user']['passwd']; 4 $imap_server = $_SESSION['phpgw_info']['expressomail']['email_server']['imapServer']; 5 $imap_port = $_SESSION['phpgw_info']['expressomail']['email_server']['imapPort']; 6 7 $msg_num = $_GET['msg_num']; 8 $msg_part = $_GET['msg_part']; 9 $msg_folder = $_GET['msg_folder']; 10 11 $mb = imap_open("{".$imap_server.":".$imap_port."}".$msg_folder, $username, $password); 12 13 $image_mail = imap_fetchbody($mb, $msg_num, $msg_part, FT_UID); 2 header("Content-Type: image/jpeg"); 3 if($_GET['msg_num'] && $_GET['msg_part'] && $_GET['msg_folder']) { 4 $username = $_SESSION['phpgw_info']['expressomail']['user']['userid']; 5 $password = $_SESSION['phpgw_info']['expressomail']['user']['passwd']; 6 $imap_server = $_SESSION['phpgw_info']['expressomail']['email_server']['imapServer']; 7 $imap_port = $_SESSION['phpgw_info']['expressomail']['email_server']['imapPort']; 8 if ($_SESSION['phpgw_info']['expressomail']['email_server']['imapTLSEncryption'] == 'yes') 9 { 10 $imap_options = '/tls/novalidate-cert'; 11 } 12 else 13 { 14 $imap_options = '/notls/novalidate-cert'; 15 } 16 17 $msg_num = $_GET['msg_num']; 18 $msg_part = $_GET['msg_part']; 19 $msg_folder = $_GET['msg_folder']; 20 21 $mb = imap_open("{".$imap_server.":".$imap_port.$imap_options."}".$msg_folder, $username, $password); 22 23 $image_mail = imap_fetchbody($mb, $msg_num, $msg_part, FT_UID); 14 24 15 header("Content-Type: image/jpeg"); 16 header("Content-Disposition: inline"); 17 18 $image = imap_base64($image_mail); 19 echo $image; 25 header("Content-Disposition: inline"); 26 $image = imap_base64($image_mail); 27 echo $image; 28 } 29 else if($_SESSION['phpgw_info']['expressomail']['contact_photo']){ 30 $data = $_SESSION['phpgw_info']['expressomail']['contact_photo']; 31 32 if($data) { 33 34 $photo = imagecreatefromstring($data[0]); 35 if($photo){ 36 $width = imagesx($photo); 37 $height = imagesy($photo); 38 $twidth = 60; 39 $theight = 80; 40 $small_photo = imagecreatetruecolor ($twidth, $theight); 41 imagecopyresampled($small_photo, $photo, 0, 0, 0, 0,$twidth, $theight, $width, $height); 42 imagejpeg($small_photo,'',100); 43 unset($_SESSION['phpgw_info']['expressomail']['contact_photo']); 44 } 45 } 46 } 47 else 48 readfile("./../../contactcenter/templates/default/images/photo_celepar.png"); 20 49 ?> -
trunk/expressoMail1_2/inc/show_thumbs.php
r2 r27 4 4 $imap_server = $_SESSION['phpgw_info']['expressomail']['email_server']['imapServer']; 5 5 $imap_port = $_SESSION['phpgw_info']['expressomail']['email_server']['imapPort']; 6 if ($_SESSION['phpgw_info']['expressomail']['email_server']['imapTLSEncryption'] == 'yes') 7 { 8 $imap_options = '/tls/novalidate-cert'; 9 } 10 else 11 { 12 $imap_options = '/notls/novalidate-cert'; 13 } 6 14 7 15 $file_type = $_GET['file_type']; … … 10 18 $msg_folder = $_GET['msg_folder']; 11 19 12 $mb = imap_open("{".$imap_server.":".$imap_port. "}".$msg_folder, $username, $password);20 $mb = imap_open("{".$imap_server.":".$imap_port.$imap_options."}".$msg_folder, $username, $password); 13 21 14 22 $image_mail = imap_fetchbody($mb, $msg_num, $msg_part, FT_UID); -
trunk/expressoMail1_2/index.php
r13 r27 4 4 'nonavbar' => False, 5 5 'currentapp' => 'expressoMail1_2', 6 'update_version' => '1.203 0',6 'update_version' => '1.20311', 7 7 'enable_nextmatchs_class' => True 8 8 ); -
trunk/expressoMail1_2/js/draw_api.js
r24 r27 543 543 544 544 td_element3 = document.createElement("TD"); 545 td_element3.id = "td_who_"+ headers_msgs.msg_number; 545 546 td_element3.setAttribute("width", "30%"); 546 var _onclick = function(){ cExecute("$this.imap_functions.get_info_msg&msg_number="+ headers_msgs.msg_number + "&msg_folder=" + msg_folder, show_msg);};547 var _onclick = function(){InfoContact.hide();cExecute("$this.imap_functions.get_info_msg&msg_number="+ headers_msgs.msg_number + "&msg_folder=" + msg_folder, show_msg);}; 547 548 td_element3.onclick = _onclick; 548 549 td_element3.innerHTML = ' '; … … 565 566 } 566 567 else{ 567 td_element3.onmouseover = function () {this.title = headers_msgs.from.email;}; 568 td_element3.onmouseover = function (event) {InfoContact.begin(this,headers_msgs.from.email);}; 569 td_element3.onmouseout = function () {InfoContact.hide();}; 568 570 if (headers_msgs.Draft == 'X'){ 569 571 td_element3.innerHTML = "<span style=\"color:red\">("+get_lang("Draft")+") </span>"; -
trunk/expressoMail1_2/setup/setup.inc.php
r24 r27 12 12 $setup_info['expressoMail1_2']['name'] = 'expressoMail1_2'; 13 13 $setup_info['expressoMail1_2']['title'] = 'ExpressoMail 1.2'; 14 $setup_info['expressoMail1_2']['version'] = '1.203 0';14 $setup_info['expressoMail1_2']['version'] = '1.2031'; 15 15 $setup_info['expressoMail1_2']['app_order'] = 2; 16 16 // $setup_info['expressoMail1_2']['tables'][] = 'phpgw_expressoMail1_2'; -
trunk/instant_messenger/docs/change_log.txt
r26 r27 13 13 - A montagem da lista de contatos é feito direto no elemento da página. 14 14 - Correção para cadastro dos contatos com acentos. 15 23/05/2007 [0.001] 16 - Na tela de autorização do contato, é mostrado o nome, email e a foto do contato que estão no LDAP -
trunk/instant_messenger/inc/class.Ujabber.inc.php
r26 r27 303 303 304 304 $this->sendIq('get','roster',NULL,NULL,"jabber:x:offline"); 305 306 305 $array_return1 = $this->readSocketFromServer(); 307 306 308 307 $array_message = array(); 309 308 $j = 0; 310 309 for($i=0; $i < count($array_return1['message']); $i++) 311 310 { 312 311 $array_message[$j]['from'] = $array_return1['message'][$i]['@']['from']; 313 $array_message[$j]['to'] = $array_return1['message'][$i]['@']['to'];312 $array_message[$j]['to'] = $array_return1['message'][$i]['@']['to']; 314 313 $array_message[$j]['body'] = urldecode(($array_return1['message'][$i]['#']['body'][0]['#'])); 314 $time = explode("T",$array_return1['message'][$i]['#']['x'][0]['@']['stamp']); 315 $h = substr($time[1],0,2); 316 $m = substr($time[1],3,2); 317 $s = substr($time[1],6,2); 318 // Carregando a hora; 319 $array_message[$j]['timestamp'] = ($h - 3 ).":".$m.":".$s; 315 320 $j++; 316 321 } 317 322 318 323 return $array_message; 319 324 } -
trunk/instant_messenger/inc/class.contacts_im.inc.php
r23 r27 70 70 return $array_7; 71 71 else 72 return false;72 return 0; 73 73 } 74 74 } -
trunk/instant_messenger/inc/class.ldap_im.inc.php
r23 r27 56 56 return; 57 57 }else{ 58 return true;58 return 1; 59 59 } 60 60 }else{ 61 return false;61 return 0; 62 62 } 63 63 }else{ 64 return false;64 return 0; 65 65 } 66 66 } … … 72 72 } 73 73 74 function list_users_ldap($orgLdap ,$type,$uid)74 function list_users_ldap($orgLdap = false,$type,$uid) 75 75 { 76 76 $result_users = array(); … … 80 80 $filter = $type ."=". $uid; 81 81 $justthese = array("uid","uidNumber","cn","mail","phpgwAccountVisible"); 82 $search = ldap_search($this->conn,"ou=".$orgLdap.",".$this->ldap_context, $filter, $justthese); 82 if($orgLdap) 83 $search = ldap_search($this->conn,"ou=".$orgLdap.",".$this->ldap_context, $filter, $justthese); 84 else 85 $search = ldap_search($this->conn,$this->ldap_context, $filter, $justthese); 83 86 $entry = ldap_get_entries($this->conn, $search); 84 87 } … … 138 141 } 139 142 143 function info_user($user) 144 { 145 $uid = $user['uid']; 146 $i= 0; 147 148 $entry = $this->list_users_ldap(false,"uid",$uid); 149 150 $result_users[0]['uid'] = $entry['uid']; 151 $result_users[0]['cn'] = $entry['cn']; 152 $result_users[0]['mail'] = $entry['mail']; 153 154 $_SESSION['debug'] = $result_users; 155 156 return $result_users; 157 158 } 140 159 } 141 160 -
trunk/instant_messenger/index2.php
r20 r27 34 34 35 35 $js = array( 36 $webserver_url . 'js/ xml.js',36 $webserver_url . 'js/XMLTools.js', 37 37 $webserver_url . 'js/json.js', 38 38 $webserver_url . 'js/im_connector.js', -
trunk/instant_messenger/js/im_connector.js
r20 r27 25 25 } 26 26 27 url = _this.DEFAULT_URL + url; 28 29 var _date = new Date(); 30 var id = url + '&thread_time=' + _date.getHours() + _date.getMinutes() + _date.getSeconds() + _date.getMilliseconds(); 27 var id = url; 31 28 if ( _this.id[id] ) 32 29 return false; … … 40 37 41 38 handler = _this._interface; 42 _this.connector.request( id,url, method, handler, params);39 _this.connector.request(url, method, handler, params); 43 40 } 44 41 cIM.prototype._interface = function(data, url) … … 48 45 if ( /^("(\\.|[^"\\\n\r])*?"|[,:{}\[\]0-9.\-+Eaeflnr-u \n\r\t])+?$/.test(data) ) 49 46 { 50 eval('data = ' + data);47 data = eval('(' + data + ')'); 51 48 if ( cIM.json ) 52 49 cIM.json = false; 53 50 else 54 data = json2array(data); 51 if ( data.constructor == Object ) 52 data = json2array(data); 55 53 } 56 54 -
trunk/instant_messenger/js/im_functions.js
r26 r27 22 22 var handler_contacts = function(data) 23 23 { 24 if ( data[1] )25 {26 24 _this.array_users.splice(0,_this.array_users.length); 27 25 _this.array_users = data; 28 26 _this.mount_list(data); 29 } 30 _this.conf_VcardUser(data[0]); 27 _this.conf_VcardUser(data[0]); 31 28 } 32 29 … … 76 73 IM.prototype.mount_list = function(pList) 77 74 { 78 var _this = this; 79 var div = document.getElementById("div_contacts"); 75 76 // Manutencao 77 // 78 // var div_manutencao = document.getElementById('contacts_im_window_body_inner'); 79 // div_manutencao.innerHTML = '<p align="center"><img src='+img_manutencao_im.src+'></p>'; 80 // return false; 81 // 82 // 83 84 var _this = this; 85 var group = ""; 86 var div = document.getElementById("div_contacts"); 80 87 div.innerHTML = ""; 81 88 … … 88 95 89 96 var div_agroups = document.getElementById("all_groups"); 90 91 if(document.getElementById("img_" + decodeURI(pList[i].group.rm_space())) == null ){ 92 div_agroups.innerHTML += '<img id="img_' + decodeURI(pList[i].group.rm_space()) + '" src="' + img_group_open.src + '" onclick="javascript:IM.visible_group(\'' + decodeURI(pList[i].group.rm_space()) + '\')" style="margin-left:16px;">'; 97 group = decodeURI(pList[i].group); 98 group = group.rm_space(); 99 if(document.getElementById("img_" + group) == null ){ 100 101 div_agroups.innerHTML += '<img id="img_' + group + '" src="' + img_group_open.src + '" onclick="javascript:IM.visible_group(\'' + group + '\')" style="margin-left:16px;">'; 93 102 div_agroups.innerHTML += '<b>' + decodeURI(pList[i].group) + '</b></br>'; 94 103 95 if( decodeURI(pList[i].group.rm_space())!= 'sem_grupo'){104 if(group != 'sem_grupo'){ 96 105 var div_group = document.createElement('DIV'); 97 div_group.id = decodeURI(pList[i].group.rm_space());106 div_group.id = group; 98 107 if(pList[i].subscription.rm_space() == "both") 99 108 div_group.innerHTML += '<div id="' + pList[i].jid + '" nuncontact="'+ i +'" onmouseover="this.className=\'contato_hover\'" onmouseout="this.className=\'\'" onmousedown="javascript:IM.action_button(event, \''+pList[i].online + '\', \'' + pList[i].jid + '\' ,false);" style="cursor:pointer;padding-left:32px;"><img src="' + ((pList[i].online) == parseInt(1) ? img_online.src : img_offline.src) + '">' + decodeURI(pList[i].name) + '</div><span id="_span_' + pList[i].jid + '" class="menu_im"></span>'; 100 109 else 101 div_group.innerHTML += '<div id="' + pList[i].jid + '" nuncontact="'+ i +'" onmouseover="this.className=\'contato_hover\'" onmouseout="this.className=\'\'" onmousedown="javascript:IM.action_button(event, \''+parseInt(0)+'\', \'' + pList[i].jid + '\' ,true);" style="cursor:pointer;padding-left:32px;"><img src="' + img_ wait_auth.src + '">' + decodeURI(pList[i].name) + '</div><span id="_span_' + pList[i].jid + '" class="menu_im"></span>';110 div_group.innerHTML += '<div id="' + pList[i].jid + '" nuncontact="'+ i +'" onmouseover="this.className=\'contato_hover\'" onmouseout="this.className=\'\'" onmousedown="javascript:IM.action_button(event, \''+parseInt(0)+'\', \'' + pList[i].jid + '\' ,true);" style="cursor:pointer;padding-left:32px;"><img src="' + img_not_authorized.src + '">' + decodeURI(pList[i].name) + '</div><span id="_span_' + pList[i].jid + '" class="menu_im"></span>'; 102 111 div_agroups.appendChild(div_group); 103 112 }else{ 104 113 var div_group = document.createElement('DIV'); 105 div_group.id = decodeURI(pList[i].group.rm_space());106 div_group.innerHTML += '<div id="'+pList[i].jid+'" onclick=Preferences.updateLoad("'+ i+'") style="cursor:pointer;padding-left:32px;">'+114 div_group.id = group; 115 div_group.innerHTML += '<div id="'+pList[i].jid+'" onclick=Preferences.updateLoad("'+pList[i].jid+'") style="cursor:pointer;padding-left:32px;">'+ 107 116 '<img src="'+img_not_authorized.src+'">'+pList[i].jid+'</div>'; 108 117 div_agroups.appendChild(div_group); … … 110 119 }else{ 111 120 112 if( decodeURI(pList[i].group.rm_space())!= 'sem_grupo'){113 var div_group = document.getElementById( decodeURI(pList[i].group.rm_space()));121 if(group != 'sem_grupo'){ 122 var div_group = document.getElementById(group); 114 123 if(pList[i].subscription.rm_space() == "both") 115 124 div_group.innerHTML += '<div id="' + pList[i].jid + '" nuncontact="'+ i +'" onmouseover="this.className=\'contato_hover\'" onmouseout="this.className=\'\'" onmousedown="javascript:IM.action_button(event, \''+pList[i].online + '\', \'' + pList[i].jid + '\',false);" style="cursor:pointer;padding-left:32px;"><img src="' + ((pList[i].online) == parseInt(1) ? img_online.src : img_offline.src) + '">' + decodeURI(pList[i].name) + '</div><span id="_span_' + pList[i].jid + '" class="menu_im"></span>'; 116 125 else 117 div_group.innerHTML += '<div id="' + pList[i].jid + '" nuncontact="'+ i +'" onmouseover="this.className=\'contato_hover\'" onmouseout="this.className=\'\'" onmousedown="javascript:IM.action_button(event, \''+parseInt(0)+'\', \'' + pList[i].jid + '\',true);" style="cursor:pointer;padding-left:32px;"><img src="' + img_ wait_auth.src + '">' + decodeURI(pList[i].name) + '</div><span id="_span_' + pList[i].jid + '" class="menu_im"></span>';126 div_group.innerHTML += '<div id="' + pList[i].jid + '" nuncontact="'+ i +'" onmouseover="this.className=\'contato_hover\'" onmouseout="this.className=\'\'" onmousedown="javascript:IM.action_button(event, \''+parseInt(0)+'\', \'' + pList[i].jid + '\',true);" style="cursor:pointer;padding-left:32px;"><img src="' + img_not_authorized.src + '">' + decodeURI(pList[i].name) + '</div><span id="_span_' + pList[i].jid + '" class="menu_im"></span>'; 118 127 div_agroups.appendChild(div_group); 119 128 }else{ 120 var div_group = document.getElementById( decodeURI(pList[i].group.rm_space()));121 div_group.innerHTML += '<div id="'+pList[i].jid+'" onclick=Preferences.updateLoad("'+ i+'") style="cursor:pointer;padding-left:32px;">'+129 var div_group = document.getElementById(group); 130 div_group.innerHTML += '<div id="'+pList[i].jid+'" onclick=Preferences.updateLoad("'+pList[i].jid+'") style="cursor:pointer;padding-left:32px;">'+ 122 131 '<img src="'+img_not_authorized.src+'">'+pList[i].jid+'</div>'; 123 132 div_agroups.appendChild(div_group); … … 271 280 IM.prototype.getMessage = function() 272 281 { 273 _this = this;282 var _this = this; 274 283 var handler_message = function(data) 275 { 276 if(data.length > 0) 277 { 278 var aux = ""; 279 var hora = new Date(); 280 for(var i=0; i < data.length; i++) 281 { 282 mensagens = document.getElementById(data[i].from.substr(0, data[i].from.indexOf('/')) + '_chatMessages'); 283 var nickname = data[i].from.substr(0, data[i].from.indexOf('/')); 284 for(var j=1 ; j < _this.array_users.length ; j++) 285 { 286 var nick_user = decodeURI(_this.array_users[j].VCARD_JID); 287 288 if( nickname.rm_space() == nick_user.rm_space()) 289 { 290 var vcard_nick = decodeURI(_this.array_users[j].VCARD_NICKNAME); 291 if( vcard_nick != "") 292 { 293 nickname = vcard_nick; 294 if(nickname.rm_space() == decodeURI(_this.array_users[j].VCARD_NICKNAME)) 295 nickname = nickname; 296 else 297 nickname = decodeURI(_this.array_users[j].VCARD_NICKNAME); 298 } 299 } 300 } 301 302 minuto = ( hora.getMinutes() > 9 ) ? hora.getMinutes() : '0' + hora.getMinutes(); 303 _hora = '[' + hora.getHours() + ':' + minuto + '] '; 304 data[i].body = decodeURI(data[i].body).replace(/\\\'/g, '\''); 305 306 if ( mensagens ) 284 { 285 if( data.length > 0) 286 { 287 var TimeStamp = ""; 288 var jid = ""; 289 var nickname = ""; 290 var body_message = ""; 291 var window_message = ""; 292 293 for( var i=0; i < data.length; i++) 294 { 295 jid = data[i].from; 296 body_message = data[i].body; 297 TimeStamp = data[i].timestamp; 298 299 jid = jid.substr(0,jid.indexOf('/')); 300 body_message = decodeURI(body_message.replace(/\\\'/g, '\'')); 301 302 window_message = document.getElementById(jid + "_chatMessages"); 303 nickname = jid; 304 305 for( var j=1; j < IM.array_users.length; j++ ) 306 { 307 if( jid == IM.array_users[j].jid ){ 308 nickname = IM.array_users[j].VCARD_NICKNAME; 309 } 310 } 311 312 if ( window_message ) 307 313 { 308 mensagens.innerHTML += '<strong>' + _hora + nickname + ' fala:</strong><br/> ' + _this.emotions_icons(data[i].body) + '<br/>';309 if ( windowItems[ data[i].from.substr(0, data[i].from.indexOf('/'))].state != WINDOW_STATE_REGULAR && windowItems[data[i].from.substr(0, data[i].from.indexOf('/'))].state != WINDOW_STATE_MAXIMIZED )310 im_win.showWindowItem( data[i].from.substr(0, data[i].from.indexOf('/')));314 window_message.innerHTML += '<strong>' + '['+ TimeStamp +']' + nickname + ' fala:</strong><br/> ' + _this.emotions_icons(body_message) + '<br/><br/>'; 315 if ( windowItems[jid].state != WINDOW_STATE_REGULAR && windowItems[jid].state != WINDOW_STATE_MAXIMIZED ) 316 im_win.showWindowItem(jid); 311 317 } 312 318 else 313 319 { 314 im_win.open_chat( data[i].from.substr(0, data[i].from.indexOf('/')));315 mensagens = document.getElementById(data[i].from.substr(0, data[i].from.indexOf('/'))+ '_chatMessages');316 mensagens.innerHTML += '<strong>' + _hora + nickname + ' fala:</strong><br/> ' + _this.emotions_icons(data[i].body) + '<br/>';320 im_win.open_chat(jid); 321 window_message = document.getElementById(jid + '_chatMessages'); 322 window_message.innerHTML += '<strong>' + '['+ TimeStamp +']' + nickname + ' fala:</strong><br/> ' + _this.emotions_icons(body_message) + '<br/><br/>'; 317 323 } 318 324 } 319 mensagens.scrollTop = mensagens.scrollHeight; 325 326 window_message.scrollTop = window_message.scrollHeight; 320 327 im_win.newMessageNotification(); 321 } 328 } 322 329 } 323 330 cIM.cExecute("$this.Ujabber.getMessages", handler_message); … … 618 625 } 619 626 620 IM.prototype.LTrim = function(value)621 {622 var w_space = String.fromCharCode(32);623 var strTemp = "";624 var iTemp = 0;625 626 if(v_length < 1) return "";627 628 var v_length = value ? value.length : 0;629 630 while ( iTemp < v_length )631 {632 if ( value && value.charAt(iTemp) != w_space )633 {634 strTemp = value.substring(iTemp,v_length);635 break;636 }637 iTemp++;638 }639 return strTemp;640 }641 642 627 // Build Object 643 628 var IM = new IM(); -
trunk/instant_messenger/js/im_images.js
r24 r27 38 38 var img_chat_bubble = new Image(); 39 39 img_chat_bubble.src = im_path + "templates/default/images/chat_bubble.gif"; 40 var img_manutencao_im = new Image(); 41 img_manutencao_im.src = im_path + "templates/default/images/manutencao_im.png"; 40 42 41 43 // Smiles -
trunk/instant_messenger/js/im_preferences.js
r26 r27 39 39 Preferences.prototype.SearchContacts = function() 40 40 { 41 41 42 var select_org = document.getElementById('ImSelOrg'); 42 43 var select_contact = document.getElementById('ImSelAddContact'); 43 44 var organization = ""; 44 45 var span_load = document.getElementById('_span_load_im'); 46 span_load.style.visibility = "visible"; 47 45 48 for(var i=0; i < select_org.options.length; i++){ 46 49 if(select_org.options[i].selected == true){ … … 56 59 text0.value = ""; 57 60 text1.value = ""; 58 if(data){ 61 62 if( data.length > 0 ){ 59 63 for(var i in data){ 60 64 var options = new Option(data[i].cn + " ( "+ data[i].mail + " )", data[i].mail, false, false); … … 62 66 } 63 67 } 68 69 span_load.style.visibility = "hidden"; 64 70 } 65 71 cIM.cExecute("$this.contacts_im.list_contacts", handler_contacts,"ou="+organization); 72 66 73 } 67 74 … … 86 93 var text2 = document.getElementById('text2'); 87 94 var _this = this; 88 89 if(IM.LTrim(text0.value) != "" && IM.LTrim(text1.value) != "" && IM.LTrim(text2.value) != ""){ 95 var jid = text0.value; 96 var subscription = ""; 97 98 if(func.trim(text0.value) != "" && func.trim(text1.value) != "" && func.trim(text2.value) != ""){ 90 99 var handler_add_contact = function(data){ 91 100 if(data){ … … 96 105 im_win.windowClose(pFunc); 97 106 IM.UpdateContacts(); 98 107 _this.Refresh_Screen(jid); 99 108 } 100 109 } … … 102 111 var group = url_encode(encodeURI(text2.value)); 103 112 if(pFunc == 'divAddUser_im') 104 cIM.cExecute("$this.Ujabber.AddNewContacts",handler_add_contact,"email="+text0.value+"&name="+name+"&group="+group+"&subscription=none");113 subscription = "none"; 105 114 else 106 cIM.cExecute("$this.Ujabber.AddNewContacts",handler_add_contact,"email="+text0.value+"&name="+name+"&group="+group+"&subscription=to"); 115 subscription = "to"; 116 cIM.cExecute("$this.Ujabber.AddNewContacts",handler_add_contact,"email="+text0.value+"&name="+name+"&group="+group+"&subscription="+subscription); 107 117 }else{ 108 118 alert("Informe todos os campos!"); … … 176 186 var opt = new Option("-- "+IM.get_lang('Choice Contact')+" -- ","0",true,true); 177 187 sel_contact.options[sel_contact.length] = opt; 178 for(var i= 0; i < IM.array_users.length; i++){188 for(var i=1; i < IM.array_users.length; i++){ 179 189 opt = new Option(decodeURI(IM.array_users[i].name),IM.array_users[i].jid, false, false); 180 190 sel_contact.options[sel_contact.length] = opt; … … 184 194 Preferences.prototype.Remove_Contact = function(pJid) 185 195 { 196 var _this = this; 186 197 for(var i=0; i < IM.array_users.length; i++){ 187 198 if(IM.array_users[i].jid == pJid){ … … 192 203 return; 193 204 }else{ 194 setTimeout("IM.UpdateContacts()",1000); 205 _this.Refresh_Screen(pJid); 206 IM.UpdateContacts(); 195 207 } 196 208 } … … 206 218 */ 207 219 208 Preferences.prototype.updateLoad = function( i)220 Preferences.prototype.updateLoad = function(pJid) 209 221 { 210 Jid = IM.array_users[i].jid;222 Jid = pJid; 211 223 Templates.update_user(); 212 224 document.getElementById('text0').value = Jid; … … 320 332 } 321 333 } 334 335 /* 336 * Detalhes do Contato para Autorização 337 */ 338 339 Preferences.prototype.Info_Contact = function(pJid) 340 { 341 var element = "_span_not_" + pJid; 342 var pElement = "teste"; 343 var uid = pJid.substr(0,pJid.indexOf('@')); 344 345 346 var handler_ldap = function(data){ 347 348 var form_details = '<table cellpadding="0" cellspacing="0" style="background-color:#cbdae4;width:80%;border:1px solid #809aa9">' + 349 '<tr><td style="vertical-align:top;width:80%">' + 350 '<div style="padding-bottom">' + 351 '<span><label>'+IM.get_lang('Name')+'</label></br>'+ data[0].cn + '</span></br></br>' + 352 '<span><label>'+IM.get_lang('E-mail')+'</label></br>'+ data[0].mail + '</span></br>' + 353 '</div></td>' + 354 '<td style="vertical-align:top"><img id="' + pJid + '_avatar" src="' + img_photo.src + '" style="height:65px;width:60px;align:right">' + 355 '</td></tr>'+ 356 '</table>'; 357 358 im_menu_action.menu(element, form_details); 359 360 // Foto Ldap; 361 im_win.get_photo_ldap(pJid); 362 } 363 cIM.cExecute("$this.ldap_im.info_user",handler_ldap,"uid="+uid); 364 365 366 } 322 367 323 368 /* … … 330 375 Templates.Send_file(pJid); 331 376 }else{ 332 alert('Funç ao Indisponível!');377 alert('Função Indisponível!'); 333 378 } 334 379 } … … 341 386 cIM.cExecute("$this.upload.size_file",h_SizeFile); 342 387 } 388 389 /* 390 * Tela de permissão para novos contatos 391 */ 392 393 Preferences.prototype.Refresh_Screen = function(pJid) 394 { 395 var el_tbl = document.getElementById("_cell_" + pJid); 396 if(el_tbl != null) 397 el_tbl.parentNode.removeChild(el_tbl); 398 } 343 399 344 400 // Build Object -
trunk/instant_messenger/js/im_templates.js
r24 r27 43 43 var _td = ""; 44 44 45 var form_add_user = "<span><b>Selecione uma Organização .: </b><select id='ImSelOrg' name='ImSelOrg' onchange='Preferences.SearchContacts();'></select>" + 45 var form_add_user = "<span style='display:block'><b>Selecione uma Organização .: </b><select id='ImSelOrg' name='ImSelOrg' onchange='Preferences.SearchContacts();'></select>" + 46 "<span id='_span_load_im' style='background-color:#cc4444;color:white;visibility:hidden;position:absolute;right:0px'>Carregando .....</span>"+ 46 47 "</span>"+ 47 48 "<select size='10' id='ImSelAddContact' name='ImSelAddContact' class='add_user' onclick='Preferences.preenche();'></select><table border='0' cellpadding='1' cellspacing='2' align='center' width='100%' >"+ … … 76 77 Templates.prototype.update_user = function() 77 78 { 78 if(document.getElementById("divChildrenFormAuthUser") != null){79 im_win.windowClose("divFormAuthUser_im");80 }81 82 79 var _this = this; 83 80 var form_update_user = "<table border='0' cellpadding='1' cellspacing='2' align='center' width='90%'>"+ … … 93 90 Templates.prototype.Users_Not_Auth = function () 94 91 { 95 var cont = 0; 96 var _this = this; 97 98 for(var i=0 ; i < IM.array_users.length; i++) 99 if(IM.array_users[i].group == "sem_grupo") 100 cont++; 92 var count = 0; 93 var _this = this; 94 var auth_user = ""; 101 95 102 if(cont > 0){ 103 var form_auth_user = "<div style='margin-left:10px;margin-top:5'>" + 104 "<br>"+ 105 "<b>O(s) contato(s) abaixo aguarda(m) sua autorização." + 106 "<br>Para adicionar este(s) novo(s) contato(s), basta dar um " + 107 "<br>clique em cima do contato." + 108 "<p>Contato(s) :" + 109 "</b><br>" + 110 "<div id='divChildrenFormAuthUser'>" + 111 "<p>" + document.getElementById('sem_grupo').innerHTML + 112 "</div></div>"; 113 114 _this.conf_form("divFormAuthUser",370,200,form_auth_user, ":: Contatos sem Cadastro - Expresso ::"); 96 auth_user = '<table border="0" cellpadding="0" cellspacing="0" width="99%">' + 97 '<tr style="background-color:#cccccc;font-weight:bold;height:20px"><td> Contato</td><td align="center">Detalhes</td><td align="center">Aceitar S/N</td></tr>'; 98 99 for(var i=0 ; i < IM.array_users.length; i++){ 100 if(IM.array_users[i].group == 'sem_grupo'){ 101 auth_user += '<tr id="_cell_'+IM.array_users[i].jid+'">'+ 102 '<td><img src="' + img_not_authorized.src + '">' + decodeURI(IM.array_users[i].name).substr(0,decodeURI(IM.array_users[i].name).indexOf('@')) + '<span id="_span_not_' + IM.array_users[i].jid + '"></span></td>'+ 103 '<td align="center"><a href="javascript:void(0);" onclick=Preferences.Info_Contact("'+IM.array_users[i].jid+'")> ? </a></td>'+ 104 '<td align="center"><a href="javascript:void(0);" onclick=Preferences.updateLoad("'+IM.array_users[i].jid+'")> Sim </a>/<a href="javascript:void(0);" onclick=Preferences.Remove_Contact("'+IM.array_users[i].jid+'")> Não </a></td>'+ 105 '</tr>'; 106 count++; 107 } 108 } 109 110 auth_user += '</table>'; 111 112 if( count > 0 ){ 113 var form_auth_user = '<div style="margin-left:5px;margin-top:2px">' + 114 '</br>'+ 115 '<b>O(s) contato(s) abaixo aguarda(m) sua autorização.' + 116 '</br>Para adicionar este(s) novo(s) contato(s), basta dar um ' + 117 'clique em cima do contato.' + 118 '<p>Contato(s) :' + 119 '</b></br>' + 120 '<div id="divChildrenFormAuthUser">'; 121 form_auth_user += auth_user + '</div></div>'; 122 _this.conf_form("divFormAuthUser",360,250,form_auth_user, ":: Contatos sem Cadastro - Expresso ::"); 123 115 124 } 116 125 } … … 233 242 grid += '<div class="menuitems" onMouseover="im_win.highlightie5(this)" onMouseout="im_win.lowlightie5(this)" onclick="im_conf_font.changeFont(\'Arial\')" id="fontStyle1" style="width:120px;font-family:arial">Arial</div>'; 234 243 grid += '<div class="menuitems" onMouseover="im_win.highlightie5(this)" onMouseout="im_win.lowlightie5(this)" onclick="im_conf_font.changeFont(\'Courier\')" id="fontStyle1" style="width:120px;font-family:Courier">Courier</div>'; 235 grid += '<div class="menuitems" onMouseover="im_wi n.highlightie5(this)" onMouseout="im_win.lowlightie5(this)" onclick="im_conf_font.changeFont(\'Times\')" id="fontStyle1" style="width:120px;font-family:Times New Roman">Times New Roman</div>';244 grid += '<div class="menuitems" onMouseover="im_wihttp://www1.la.dell.com/content/products/features.aspx/advertised_latn.highlightie5(this)" onMouseout="im_win.lowlightie5(this)" onclick="im_conf_font.changeFont(\'Times\')" id="fontStyle1" style="width:120px;font-family:Times New Roman">Times New Roman</div>'; 236 245 grid += '<div style="background:#cccccc;margin:1px"><img src="../images/blank.gif" height="1" width="1" border="0"/></div>'; 237 246 grid += '<div class="menuitems" onMouseover="im_win.highlightie5(this)" onMouseout="im_win.lowlightie5(this)" onclick="im_win.hideFontNameSelection()" id="fontStyle1" style="width:120px">Close This Menu</div>'; -
trunk/instant_messenger/js/im_win.js
r26 r27 661 661 if(data){ 662 662 IdLdap = ( IM.vcard_user['VCARD_JID'] == IdLdap ) ? 'contacts' : IdLdap; 663 if( document.getElementById(IdLdap + "_avatar")){664 var ph oto_img_0= document.getElementById(IdLdap + "_avatar");665 ph oto_img_0.src = im_path + "inc/class.ldap_im.inc.php?user="+uid_ldap;663 if( document.getElementById(IdLdap + "_avatar") != null ){ 664 var ph_img = document.getElementById(IdLdap + "_avatar"); 665 ph_img.src = (im_path + "inc/class.ldap_im.inc.php?user="+uid_ldap) ? im_path + "inc/class.ldap_im.inc.php?user="+uid_ldap : img_photo.src ; 666 666 } 667 667 } … … 905 905 else 906 906 document.title = "......................"; 907 907 908 if ( newMessageTimer ) 908 909 clearTimeout(newMessageTimer);
Note: See TracChangeset
for help on using the changeset viewer.