Changeset 15
- Timestamp:
- 04/19/07 18:32:45 (17 years ago)
- Location:
- trunk
- Files:
-
- 7 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/calendar/inc/class.boicalendar.inc.php
r2 r15 40 40 * Class 41 41 */ 42 define(' PRIVATE',0);43 define(' PUBLIC',1);44 define(' CONFIDENTIAL',3);42 define('_PRIVATE',0); 43 define('_PUBLIC',1); 44 define('_CONFIDENTIAL',3); 45 45 46 46 /* … … 1896 1896 switch($var) 1897 1897 { 1898 case ' PRIVATE':1899 returnPRIVATE;1900 break; 1901 case ' PUBLIC':1902 returnPUBLIC;1903 break; 1904 case ' CONFIDENTIAL':1905 returnCONFIDENTIAL;1898 case '_PRIVATE': 1899 $var = _PRIVATE; 1900 break; 1901 case '_PUBLIC': 1902 $var = _PUBLIC; 1903 break; 1904 case '_CONFIDENTIAL': 1905 $var = _CONFIDENTIAL; 1906 1906 break; 1907 1907 } … … 1911 1911 switch((int)$var) 1912 1912 { 1913 case PRIVATE: 1914 return 'PRIVATE'; 1915 break; 1916 case PUBLIC: 1917 return 'PUBLIC'; 1918 break; 1919 case CONFIDENTIAL: 1920 return 'CONFIDENTIAL'; 1921 break; 1922 } 1923 } 1924 else 1925 { 1926 return $var; 1927 } 1913 case _PRIVATE: 1914 $var = '_PRIVATE'; 1915 break; 1916 case _PUBLIC: 1917 $var = '_PUBLIC'; 1918 break; 1919 case _CONFIDENTIAL: 1920 $var = '_CONFIDENTIAL'; 1921 break; 1922 } 1923 } 1924 return $var; 1928 1925 } 1929 1926 -
trunk/calendar/inc/class.uialarm.inc.php
r2 r15 206 206 //echo "<p>alarm_management='".htmlspecialchars($this->template->get_var('alarm_management'))."'</p>\n"; 207 207 $this->template->pfp('out','alarm_management'); 208 } 208 $GLOBALS['phpgw']->common->phpgw_footer(); 209 } 210 209 211 } 210 212 ?> -
trunk/calendar/inc/class.uicalendar.inc.php
r2 r15 327 327 } 328 328 $GLOBALS['phpgw']->redirect($this->page('',$params)); 329 329 330 } 330 331 … … 365 366 366 367 $GLOBALS['phpgw']->common->phpgw_header(); 367 $new_body = $this->bo->debug_string.$body; 368 $new_body = $this->bo->debug_string.$body; 368 369 369 370 } … … 374 375 { 375 376 echo $this->printer_friendly($this->get_month(),lang('Monthview')); 377 $GLOBALS['phpgw']->common->phpgw_footer(); 376 378 } 377 379 … … 469 471 { 470 472 echo $this->printer_friendly($this->get_week(),lang('Weekview')); 473 $GLOBALS['phpgw']->common->phpgw_footer(); 471 474 } 472 475 … … 644 647 } 645 648 echo $this->printer_friendly($this->get_year(),lang('Yearview')); 649 $GLOBALS['phpgw']->common->phpgw_footer(); 646 650 } 647 651 … … 933 937 )); 934 938 939 $GLOBALS['phpgw']->common->phpgw_footer(); 935 940 } 936 941 … … 1261 1266 ) 1262 1267 ); 1268 $GLOBALS['phpgw']->common->phpgw_footer(); 1263 1269 } 1264 1270 … … 1382 1388 $p->parse('day_events','day_event'); 1383 1389 print $this->printer_friendly($p->fp('out','day'),lang('Dayview')); 1390 $GLOBALS['phpgw']->common->phpgw_footer(); 1384 1391 } 1385 1392 -
trunk/contactcenter/inc/class.ui_data.inc.php
r13 r15 2437 2437 break; 2438 2438 2439 case 'outlook2000_pt-BR': 2440 $streamBuffer = "\"Tratamento\",\"Nome\",\"Segundo Nome\",\"Sobrenome\",\"Sufixo\",". 2441 "\"Empresa\",\"Departamento\",\"Cargo\",\"Rua do endereço comercial\",\"Rua do endereço comercial 2\",". 2442 "\"Rua do endereço comercial 3\",\"Cidade do endereço comercial\",\"Estado do endereço comercial\",". 2443 "\"CEP do endereço comercial\",\"País do endereço comercial\",\"Endereço residencial\",\"Rua residencial 2\",". 2444 "\"Rua residencial 3\",\"Cidade do endereço residencial\",\"Estado\",\"CEP do endereço residencial\",\"País do endereço residencial\",". 2445 "\"Outro endereço\",\"Outro endereço 2\",\"Outro endereço 3\",\"Cidade\",\"Estado\",\"CEP\",\"País\",". 2446 "\"Telefone do assistente\",\"Fax comercial\",\"Telefone comercial\",\"Telefone comercial 2\",\"Retorno de chamada\",". 2447 "\"Telefone do carro\",\"Telefone principal da empresa\",\"Fax residencial\",\"Telefone residencial\",". 2448 "\"Telefone residencial 2\",\"ISDN\",\"Telefone celular\",\"Outro fax\",\"Outro telefone\",\"Pager\",\"Telefone principal\",". 2449 "\"Radiofone\",\"Telefone TTY/TDD\",\"Telex\",\"Aniversário\",\"Anotações\",\"Caixa postal\",\"Categorias\",". 2450 "\"Código da empresa\",\"Código do governo\",\"Cônjuge\",\"Conta\",\"Endereço de correio eletrônico\",". 2451 "\"Nome de exibição do correio eletr.\",\"Endereço de correio eletrônico 2\",". 2452 "\"Nome de exibição do correio eletr.2\",\"Endereço de correio eletrônico 3\",". 2453 "\"Nome de exibição do correio eletr.3\",\"Datas especiais\",\"Disponibilidade da Internet\",". 2454 "\"Filhos\",\"Hobby\",\"Idioma\",\"Indicação\",\"Informações para cobrança\",\"Iniciais\",\"Local\",". 2455 "\"Nome do assistente\",\"Nome do gerenciador\",\"Página da Web\",\"Palavras-chave\",\"Particular\",\"Personalizado 1\",\"Personalizado 2\",". 2456 "\"Personalizado 3\",\"Personalizado 4\",\"Prioridade\",\"Profissão\",\"Quilometragem\",\"Sala\",\"Sensibilidade\",\"Servidor de diretório\",". 2457 "\"Sexo\"\r\n"; 2458 foreach($contacts as $index => $object){ 2459 $streamBuffer.= ",\"".$object['names_ordered']."\",,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,\"".$object['connection_value']."\",,,,,,,,,,,,,,,,,,,,,,,,,,,,,,\r\n"; 2460 } 2461 break; 2462 2463 case 'outlook2000_en': 2464 $streamBuffer = "Title,First Name,Middle Name,Last Name,Suffix,Company,Department,Job Title,". 2465 "Business Street,Business Street 2,Business Street 3,Business City,Business State,Business Postal Code,". 2466 "Business Country,Home Street,Home Street 2,Home Street 3,Home City,Home State,Home Postal Code,Home Country,". 2467 "Other Street,Other Street 2,Other Street 3,Other City,Other State,Other Postal Code,Other Country,". 2468 "Assistant's Phone,Business Fax,Business Phone,Business Phone 2,Callback,Car Phone,Company Main Phone,Home Fax,". 2469 "Home Phone,Home Phone 2,ISDN,Mobile Phone,Other Fax,Other Phone,Pager,Primary Phone,Radio Phone,TTY/TDD Phone,Telex,". 2470 "Account,Anniversary,Assistant's Name,Billing Information,Birthday,Categories,Children,Directory Server,E-mail Address,". 2471 "E-mail Type,E-mail Display Name,E-mail 2 Address,E-mail 2 Type,E-mail 2 Display Name,E-mail 3 Address,E-mail 3 Type,E-mail 3 Display Name,". 2472 "Gender,Government ID Number,Hobby,Initials,Internet Free Busy,Keywords,Language,Location,Manager's Name,Mileage,Notes,". 2473 "Office Location,Organizational ID Number,PO Box,Priority,Private,Profession,Referred By,Sensitivity,Spouse,User 1,User 2,User 3,User 4,Web Page\r\n"; 2474 foreach($contacts as $index => $object){ 2475 $streamBuffer.= ",".$object['names_ordered'].",,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,".$object['connection_value'].",,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,\r\n"; 2476 } 2477 break; 2478 2439 2479 case 'thunderbird': 2440 2480 $streamBuffer = ""; … … 2468 2508 2469 2509 $delim = ($typeImport == 'outlook' ? ';' : ','); 2470 $is_default = ($typeImport == 'thunderbird' ? false : true);2471 //die(serialize(array('delimiter' => $delim, 'is_default' => $is_default)));2472 2510 2473 2511 if($file = $_SESSION['contactcenter']['importCSV']) { … … 2478 2516 $handle = @fopen($file, "r") or die(serialize($return['error'] = true)); 2479 2517 $header = @fgetcsv($handle, $len, $delim) or die(serialize($return['error'] = true)); 2480 if(count($header) < 2 || count($header) > 50) {2518 if(count($header) < 2 || count($header) > 100) { 2481 2519 $return['error'] = true; 2482 2520 $return['sizeheader'] = count($header); … … 2487 2525 $boGroup = CreateObject('contactcenter.bo_group'); 2488 2526 $boPeople = CreateObject('contactcenter.bo_people_catalog'); 2527 2528 switch($typeImport){ 2529 case 'outlook2000': 2530 $namepos=1; 2531 $emailpos=56; 2532 break; 2533 case 'thunderbird': 2534 $namepos=2; 2535 $emailpos=4; 2536 break; 2537 default: 2538 $namepos=0; 2539 $emailpos=1; 2540 } 2541 2489 2542 while (($data = fgetcsv($handle, $len, $delim))) { 2490 2543 2491 2544 foreach ($header as $key=>$heading) 2492 2545 $row[$heading]=(isset($data[$key])) ? $data[$key] : ''; 2493 2546 2494 2547 $sdata = array(); 2495 $full_name = trim($row[$ is_default ? $header[0] : $header[2]]);2496 $email = trim($row[$ is_default ? $header[1] : $header[4]]);2548 $full_name = trim($row[$header[$namepos]]); 2549 $email = trim($row[$header[$emailpos]]); 2497 2550 $array_name = explode(' ', str_replace('"','',(str_replace('\'','',$full_name)))); 2498 2551 $sdata['given_names'] = $array_name[0]; … … 2520 2573 } 2521 2574 fclose($handle); 2522 unlink($file); 2575 unlink($file); 2523 2576 } 2524 2577 else -
trunk/contactcenter/js/ccIEContacts.js
r2 r15 41 41 'Selecione o tipo do arquivo: <select id="typeImport">'+ 42 42 '<option value="outlook">Outlook Express</option>'+ 43 '<option value="outlook2000">Outlook 2000</option>'+ 43 44 '<option value="thunderbird">Mozilla Thunderbird</option>'+ 44 45 '<option value="expresso" selected>Expresso (padrão)</option></select><br>'+ … … 59 60 '<input style="border:0" id="typeExport_1" name="radio" type="radio" value="outlook_pt-BR">Exportar como CSV do Outlook Express (Português)<br>'+ 60 61 '<input style="border:0" id="typeExport_2" name="radio" type="radio" value="outlook_en">Exportar como CSV do Outlook Express (Inglês)<br>'+ 61 '<input style="border:0" id="typeExport_3" name="radio" type="radio" value="thunderbird">Exportar como CSV do Mozilla Thunderbird'+ 62 '<input style="border:0" id="typeExport_3" name="radio" type="radio" value="outlook2000_pt-BR">Exportar como CSV do Outlook 2000 (Português)<br>'+ 63 '<input style="border:0" id="typeExport_4" name="radio" type="radio" value="outlook2000_en">Exportar como CSV do Outlook 2000 (Inglês)<br>'+ 64 '<input style="border:0" id="typeExport_5" name="radio" type="radio" value="thunderbird">Exportar como CSV do Mozilla Thunderbird<br>'+ 62 65 '</td></tr>'+ 63 66 '<tr><td align="center"> </td></tr>'+ … … 216 219 var typeExport = Element("typeExport"); 217 220 218 for(var index = 0; index < 4; index++){221 for(var index = 0; index < 5; index++){ 219 222 if(Element('typeExport_'+index).checked) 220 break; 223 break; 221 224 } 222 225 -
trunk/expressoAdmin1_2/inc/class.maillist.inc.php
r14 r15 158 158 159 159 //////////////////////////////////////////////////////////////////////////////////////////////////////////////////// 160 // REPLACE MAIL & CN160 // REPLACE MAIL || CN || SN 161 161 if ($new_values['mail'] != $old_values['mail']) 162 162 { … … 168 168 $ldap_mod_replace['cn'] = $new_values['cn']; 169 169 $this->db_functions->write_log("Modificado common name da lista $dn",'',$dn,'',''); 170 } 171 if ($diff['uid']) 172 { 173 $ldap_mod_replace['sn'] = $new_values['uid']; 170 174 } 171 175 -
trunk/index.php
r2 r15 124 124 } 125 125 126 if(!isset($GLOBALS['phpgw_info']['nofooter']))126 /*if(!isset($GLOBALS['phpgw_info']['nofooter'])) 127 127 { 128 128 $GLOBALS['phpgw']->common->phpgw_footer(); 129 } 129 }*/ 130 130 ?>
Note: See TracChangeset
for help on using the changeset viewer.