Changeset 7228 for branches/2.4/expressoAdmin1_2
- Timestamp:
- 09/17/12 14:30:47 (12 years ago)
- Location:
- branches/2.4
- Files:
-
- 20 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/2.4
- Property svn:mergeinfo changed
-
branches/2.4/expressoAdmin1_2/controller.php
r7207 r7228 74 74 $result = array(); 75 75 76 77 76 // if params is not empty, then class method with parameters. 78 77 if($params) … … 84 83 85 84 // Return result serialized. 85 $_SESSION['response'] = $result; 86 87 // Return result serialized. 86 88 if(!$cExecuteFormReturn) 87 89 echo serialize($result); -
branches/2.4/expressoAdmin1_2/inc/class.bosectors.inc.php
r6754 r7228 53 53 $sector_info['diskQuota'] = isset($_POST['disk_quota']) ? (int)$_POST['disk_quota'] : 0; 54 54 $sector_info['usersQuota'] = isset($_POST['users_quota']) ? (int)$_POST['users_quota'] : 0; 55 56 if( isset($_POST['associated_domain']) ) 57 { 58 if ( $_POST['associated_domain'] != "") { 59 $sector_info['objectClass'][] = 'domainRelatedObject'; 60 $sector_info['associatedDomain'] = trim($_POST['associated_domain']); 61 } 62 } 55 63 56 64 $systemName = $GLOBALS['phpgw_info']['server']['system_name']; -
branches/2.4/expressoAdmin1_2/inc/class.ldap_functions.inc.php
r6096 r7228 835 835 836 836 $filter = "(&(phpgwAccountType=u)(cpf=$cpf))"; 837 $justthese = array("cn","uid" );837 $justthese = array("cn","uid" ,"mail"); 838 838 $search = ldap_search($local_ldap_connection, $context, $filter, $justthese); 839 839 $entries = ldap_get_entries($local_ldap_connection,$search); … … 847 847 { 848 848 if (strcasecmp($uid, $entries[$i]['uid'][0]) != 0) 849 $result['question'] .= "- " . $entries[$i]['cn'][0] . "\n";849 $result['question'] .= "- " . $entries[$i]['cn'][0] ." - ".$entries[$i]['uid'][0] ." - ".$entries[$i]['mail'][0] . "\n"; 850 850 } 851 851 $result['question'] .= $this->functions->lang("Do you want to continue anyway") . "?"; … … 2913 2913 2914 2914 return $return; 2915 } 2916 2917 2915 } 2918 2916 2919 2917 } -
branches/2.4/expressoAdmin1_2/inc/class.uimaillists.inc.php
r6157 r7228 265 265 else 266 266 { 267 $mail_not_found .= "<option value=" . $mail . ">" . utf8_decode($cn) . " (" . $array_users_uid[$mail] . ")</option>";267 $mail_not_found .= "<option value=" . $mail . ">" . $array_users_uid[$mail] . "</option>"; 268 268 } 269 269 } … … 271 271 if ($mail_not_found != '') 272 272 { 273 $opt_tmp_mail_not_found = '<option value="-1" disabled>-------------------- '.lang('e mails did not find').' ------------------ </option>'."\n";273 $opt_tmp_mail_not_found = '<option value="-1" disabled>-------------------- '.lang('external users').' ------------------ </option>'."\n"; 274 274 $ea_select_usersInMaillist .= $opt_tmp_mail_not_found . $mail_not_found; 275 275 } -
branches/2.4/expressoAdmin1_2/inc/class.uisectors.inc.php
r6754 r7228 192 192 'context' => $context == '' ? $GLOBALS['phpgw_info']['server']['ldap_context'] : $context, 193 193 'sector' => $_POST['sector'], 194 'associated_domain' => $_POST['associated_domain'], 194 195 'disk_quota' => $_POST['disk_quota'], 195 196 'users_quota' => $_POST['users_quota'], 196 197 'manager_org' => $combo_manager_org, 197 198 'sector_visible_checked'=> $_POST['sector_visible'] ? 'checked' : '', … … 256 257 { 257 258 $sector_info = $this->so->get_info($_GET['context']); 258 $sector_disk_quota = $sector_info[0]['diskquota'][0]; 259 $sector_users_quota = $sector_info[0]['usersquota'][0]; 259 $sector_disk_quota = $sector_info[0]['diskquota'][0]; 260 $sector_users_quota = $sector_info[0]['usersquota'][0]; 261 $sector_associated_domain = $sector_info[0]['associateddomain'][0]; 260 262 $_POST['sector_visible'] = $sector_info[0]['phpgwaccountvisible'][0]; 261 263 } … … 270 272 'manager_org' => $combo_manager_org, 271 273 'sector_visible_checked'=> $_POST['sector_visible'] ? 'checked' : '', 272 273 274 274 'disk_quota' => $_POST['disk_quota'] == '' ? $sector_disk_quota : $_POST['disk_quota'], 275 'users_quota' => $_POST['users_quota'] == '' ? $sector_users_quota : $_POST['users_quota'], 276 'associated_domain' => $_POST['associated_domain'] == '' ? $sector_associated_domain : $_POST['associated_domain'], 275 277 'lang_add' => lang('Add'), 276 278 'disable' => 'disabled', -
branches/2.4/expressoAdmin1_2/inc/class.user.inc.php
r6754 r7228 79 79 80 80 // Cria array para incluir no LDAP 81 $dn = 'uid=' . $params['uid'] . ',' . $params['context']; 82 83 $user_info = array(); 81 $dn = 'uid=' . $params['uid'] . ',' . $params['context']; 82 83 ob_start(); 84 print_r($params); 85 $output = ob_get_clean(); 86 file_put_contents( "/tmp/acoutinho.log", $output , FILE_APPEND); 87 88 89 $user_info = array(); 84 90 $user_info['accountStatus'] = $params['accountstatus'] == 1 ? 'active' : 'desactive'; 85 91 $user_info['cn'] = $params['givenname'] . ' ' . $params['sn']; -
branches/2.4/expressoAdmin1_2/js/jscode/maillists.js
r5133 r7228 384 384 return ufn.substring(0,(ufn.length-1)); 385 385 } 386 387 function LTrim(value) 388 { 389 var w_space = String.fromCharCode(32); 390 var strTemp = ""; 391 var iTemp = 0; 392 393 var v_length = value ? value.length : 0; 394 if(v_length < 1) 395 return ""; 396 397 while(iTemp < v_length){ 398 if(value && value.charAt(iTemp) != w_space){ 399 strTemp = value.substring(iTemp,v_length); 400 break; 401 } 402 iTemp++; 403 } 404 return strTemp; 405 } 406 407 function validateEmail() 408 { 409 410 externalEmail = document.getElementById('ea_input_externalUser'); 411 412 if( externalEmail.value ) 413 { 414 //var element = arguments[0]; 415 var validate = /^([a-zA-Z0-9_\.\-])+\@(([a-zA-Z0-9\-])+\.)+([a-zA-Z0-9]{2,4})+$/; 416 417 if(this.LTrim(externalEmail.value) != "" && externalEmail.value != "") 418 { 419 if(!validate.test(externalEmail.value)) 420 { 421 alert(get_lang('Email address is not valid') + '.'); 422 externalEmail.focus(); 423 return false; 424 }else { 425 this.add_externalUser2maillist(externalEmail.value); 426 } 427 } 428 429 } 430 } 431 432 function add_externalUser2maillist(mailAddress) 433 { 434 input_externalUsers = mailAddress.toLowerCase(); //document.getElementById('ea_input_externalUser').value; 435 select_usersInMaillist = document.getElementById('ea_select_usersInMaillist'); 436 437 var count_externalUsers = input_externalUsers.length; 438 var count_usersInMaillist = select_usersInMaillist.options.length; 439 var new_options = ''; 440 441 var teste = ''; //Variavel que ira receber mensagem de alerta ao usuario; 442 var alerta = new Boolean(0); //Variavel que sera usada para verificar se o alerta ao usuario sera exibido ou nao; 443 444 //Laco abaixo compara se o valor escolhido em select_available_users ja existe em select_usersInMaillist 445 //se existir, adiciona o valor em teste e muda a variavel alerta para true; teste sera exibido em tela 446 //apenas de alerta true; ver if no fim da funcao; 447 for(j = 0; j < count_usersInMaillist; j++) 448 { 449 var tmp = select_usersInMaillist.options[j].text 450 451 if(tmp.match(input_externalUsers)) 452 { 453 teste = get_lang("User already belongs to the list") + "\n" + input_externalUsers + "\n"; 454 alerta = new Boolean(1); 455 } 456 } 457 458 if(alerta != true) 459 { 460 if(document.all) 461 { 462 if ( (select_usersInMaillist.innerHTML.indexOf('value='+input_externalUsers)) == '-1' ) 463 { 464 new_options += "<option value=" 465 + input_externalUsers 466 + ">" 467 + input_extenalUsers 468 + "</options>"; 469 } 470 } 471 else 472 { 473 if ( (select_usersInMaillist.innerHTML.indexOf('value="'+input_externalUsers+'"')) == '-1' ) 474 { 475 new_options += "<option value=" 476 + input_externalUsers 477 + ">" 478 + input_externalUsers 479 + "</options>"; 480 } 481 } 482 } 483 484 if(alerta == true) 485 { 486 alert(teste); 487 } 488 489 490 if (new_options != '') 491 { 492 select_usersInMaillist.innerHTML = new_options + select_usersInMaillist.innerHTML; 493 select_usersInMaillist.outerHTML = select_usersInMaillist.outerHTML; 494 } 495 496 document.getElementById('ea_input_externalUser').value = ''; 497 } -
branches/2.4/expressoAdmin1_2/js/jscode/messages_size.js
r6884 r7228 652 652 Element('em_input_sendAcl').checked = false; 653 653 } 654 654 655 655 if (Element('em_input_deleteAcl').checked) 656 656 acl += 'te'; 657 657 658 658 if (Element('em_input_writeAcl').checked) 659 659 acl += 'wi'; 660 660 661 661 if (Element('em_input_sendAcl').checked) -
branches/2.4/expressoAdmin1_2/js/jscode/shared_accounts.js
r6971 r7228 252 252 } 253 253 } 254 //Nova chamada a "Element" é Necessária devido a um bug do ie com select254 //Nova chamada a "Element" é Necessária devido a um bug do ie com select 255 255 select_owners = Element('ea_select_owners'); 256 256 if(select_owners.options.length > 0 ){ … … 324 324 Element('quota_used_field').style.display = 'inline'; 325 325 Element('desc').value = data.description; 326 //Necessario, pois o IE6 tem um bug que n ão exibe as novas opções se o innerHTML estava vazio326 //Necessario, pois o IE6 tem um bug que não exibe as novas opções se o innerHTML estava vazio 327 327 328 328 if(data.owners_options){ -
branches/2.4/expressoAdmin1_2/setup/phpgw_pt-br.lang
r6754 r7228 168 168 Enable blocking sending email to shared accounts (departments) expressoAdmin1_2 pt-br Ativar bloqueio de envio de e-mails para Contas Compartilhadas (departamentos) 169 169 error adding application to new manager expressoAdmin1_2 pt-br Erro adicionando aplicação ao novo gerente 170 Email address is not valid expressoAdmin1_2 pt-br Endereço de e-mail não válido 170 171 Error on function expressoAdmin1_2 pt-br Erro na função 171 172 Error on insert expressoAdmin1_2 pt-br Erro na inserção … … 173 174 Error on Updating expressoAdmin1_2 pt-br Erro na atualização 174 175 Error in OpenLDAP. expressoAdmin1_2 pt-br Erro no OpenLDAP. 176 User already belongs to the list expressoAdmin1_2 pt-br Usuário já pertence a lista 177 external user expressoAdmin1_2 pt-br Usuário externo 178 external users expressoAdmin1_2 pt-br Usuários externos 175 179 Expire expressoAdmin1_2 pt-br Expira 176 180 expressoAdmin1_2 common pt-br Expresso Admin -
branches/2.4/expressoAdmin1_2/setup/setup.inc.php
r6754 r7228 13 13 $setup_info['expressoAdmin1_2']['title'] = 'Expresso Admin'; 14 14 /* Ao incrementar versão, não esquecer de declarar função do tables_update.inc.php*/ 15 $setup_info['expressoAdmin1_2']['version'] = '2.4. 1';15 $setup_info['expressoAdmin1_2']['version'] = '2.4.2'; 16 16 $setup_info['expressoAdmin1_2']['app_order'] = 1; 17 17 $setup_info['expressoAdmin1_2']['tables'][] = 'phpgw_expressoadmin'; … … 37 37 $setup_info['expressoAdmin1_2']['depends'][] = array( 38 38 'appname' => 'phpgwapi', 39 'versions' => Array('2.4. 1')39 'versions' => Array('2.4.2') 40 40 ); 41 41 ?> -
branches/2.4/expressoAdmin1_2/setup/tables_update.inc.php
r6754 r7228 330 330 $GLOBALS['setup_info']['expressoAdmin1_2']['currentver'] = '2.4.1'; 331 331 return $GLOBALS['setup_info']['expressoAdmin1_2']['currentver']; 332 } 332 } 333 334 $test[] = '2.4.1'; 335 function expressoAdmin1_2_upgrade2_4_1() 336 { 337 $GLOBALS['setup_info']['expressoAdmin1_2']['currentver'] = '2.4.2'; 338 return $GLOBALS['setup_info']['expressoAdmin1_2']['currentver']; 339 } 333 340 ?> -
branches/2.4/expressoAdmin1_2/templates/default/accounts_form.tpl
r5133 r7228 15 15 <input type="hidden" name="photo_exist" value="{photo_exist}"> 16 16 <input type="hidden" name="user_context" value="{user_context}"> 17 <input type="hidden" name="departmentnumber" 17 <input type="hidden" name="departmentnumber" value="{departmentnumber}"> 18 18 <input type="hidden" name="userSamba" value="{userSamba}"> 19 <input type="hidden" name="defaultLogonScript" 19 <input type="hidden" name="defaultLogonScript" value="{defaultLogonScript}"> 20 20 <input type="hidden" name="imapDelimiter" value="{imapDelimiter}"> 21 <input type="hidden" name="minimumSizeLogin" 21 <input type="hidden" name="minimumSizeLogin" value="{minimumSizeLogin}"> 22 22 <input type="hidden" name="defaultDomain" value="{defaultDomain}"> 23 23 <input type="hidden" name="ldap_context" value="{ldap_context}"> 24 <input type="hidden" name="associated_domain" value="{associated_domain}"> 24 25 25 26 <br> … … 42 43 <tr bgcolor={row_on}> 43 44 <td>{lang_search_organization}:</td> 44 <td><input type="text" id="organization_search" {disabled} autocomplete="off" size=20 onKeyUp="javascript:search_organization(this.value, 'ea_combo_org_info');" onBlur="javascript:sinc_combos_org(context.value); get_a vailable_sambadomains(context.value, '{type}')"></td>45 <td><input type="text" id="organization_search" {disabled} autocomplete="off" size=20 onKeyUp="javascript:search_organization(this.value, 'ea_combo_org_info');" onBlur="javascript:sinc_combos_org(context.value); get_associated_domain(context.value); get_available_groups(context.value); get_available_maillists(context.value); get_available_sambadomains(context.value, '{type}')"></td> 45 46 </tr> 46 47 47 48 <tr bgcolor={row_off}> 48 49 <td>{lang_organizations}:</td> 49 <td><select {disabled} id="ea_combo_org_info" name="context" onchange="javascript:sinc_combos_org(this.value); get_a vailable_groups(this.value); get_available_maillists(this.value); get_available_sambadomains(this.value, '{type}')">{sectors}</select></td>50 <td><select {disabled} id="ea_combo_org_info" name="context" onchange="javascript:sinc_combos_org(this.value); get_associated_domain(this.value); get_available_groups(this.value); get_available_maillists(this.value); get_available_sambadomains(this.value, '{type}')">{sectors}</select></td> 50 51 </tr> 51 52 -
branches/2.4/expressoAdmin1_2/templates/default/assing_calendar.css
r6964 r7228 3 3 div.assing-calendar dd{margin: 0 0 0 0 !important;} 4 4 5 /*div.user-acls-shared-calendar{margin: -15px 0 0 0;}*/ 5 /*div.user-acls-shared-calendar{margin: -15px 0 0 0;}*/ 6 6 7 7 div.assing-calendar dd.calendar-list{ overflow-y: auto; overflow-x: hidden;} … … 9 9 div.assing-calendar dl{margin: 5px !important;} 10 10 11 div.assing-calendar fieldset.add-user-search{width: 2 34px;}11 div.assing-calendar fieldset.add-user-search{width: 240px;} 12 12 div.assing-calendar input.search{width: 210px;} 13 13 … … 17 17 18 18 div.assing-calendar div.menu-container.footer-container{margin: 2px 0 -12px 0 !important;} 19 div.assing-calendar ul.search-result-list,div.assing-calendar ul.user-list{margin -left: -54px !important; width: 252px !important;}19 div.assing-calendar ul.search-result-list,div.assing-calendar ul.user-list{margin: 0; padding: 0; } 20 20 div.assing-calendar ul li{overflow: hidden !important;} 21 21 div.assing-calendar li.not-user{margin: 0 0 0 20px !important;} 22 div.assing-calendar fieldset.add-user-search{margin: 0 0 5px -10px !important;}22 div.assing-calendar fieldset.add-user-search{margin: 0 0 5px 0px !important;} 23 23 24 24 div.assing-calendar dd.add-user {height: 290px !important;} 25 25 26 div.assing-calendar dd.calendar-list li{height: 20px !important; margin: 0 0 0 10px !important;}26 div.assing-calendar dd.calendar-list li{height: 20px !important; margin: 0 0 0 0x !important;} 27 27 28 28 div.assing-calendar dd.calendar-list li div{display: block !important;} 29 29 30 div.assing-calendar dd.calendar{height: 24px; }30 div.assing-calendar dd.calendar{height: 24px; text-align: left;} 31 31 32 div.assing-calendar li.calendar-selected{ 33 margin: 0px 0 0 -40px; 34 -webkit-margin-before: -13px; 32 div.assing-calendar ul.search-result-list{height: 245px;} 33 34 35 div.assing-calendar ul.search-result-list label.name{overflow: hidden; height: 15px;} 36 37 div.assing-calendar li.calendar-selected{ 38 margin: 0px 0 0 -40px; 39 -webkit-margin-before: -13px; 35 40 } 36 41 div.assing-calendar li.calendar-selected a {margin: 0 0 -2px 15px;} 37 42 38 div.assing-calendar dd.calendar-list li.user-list{width: 333px; }43 div.assing-calendar dd.calendar-list li.user-list{width: 333px; list-style-type: none;} -
branches/2.4/expressoAdmin1_2/templates/default/index.tpl
r5804 r7228 108 108 </tr> 109 109 </table> 110 < input type="hidden" id="assingCalendar"/>110 <div class="hidden" id="assingCalendar"/> 111 111 <!-- END body --> -
branches/2.4/expressoAdmin1_2/templates/default/institutional_accounts_modal.tpl
r6157 r7228 17 17 <br /> 18 18 {lang_organization}:<br /> 19 <select id="ea_combo_org" name="context" onchange="javascript:sinc_combos_org(this.value); ">{manager_organizations}</select><br />19 <select id="ea_combo_org" name="context" onchange="javascript:sinc_combos_org(this.value);javascript:get_associated_domain(this.value);">{manager_organizations}</select><br /> 20 20 21 <input type="hidden" id="associated_domain" name="associated_domain" /> 22 21 23 {lang_full_name}: <font color="blue">{lang_eg}: Setor Diser</font><br /> 22 24 <input id="cn" name="cn" size="35" autocomplete="off" /><br /> -
branches/2.4/expressoAdmin1_2/templates/default/maillists_form.tpl
r6158 r7228 73 73 <b>{lang_users}:</b><br> 74 74 <select id="ea_select_available_users" style="width:400px; height:200px" multiple size="13"></select> 75 <br/><br/> 76 <b>{lang_external_user}:</b> 77 <br/> 78 <input id="ea_input_externalUser" size="35" type="text"> 79 <input id="input_user" value="Adicionar" onclick="javascript:validateEmail();" type="button"> 80 <br/> 75 81 </td> 76 82 </tr> -
branches/2.4/expressoAdmin1_2/templates/default/participants_search_itemlist.ejs
r5804 r7228 1 1 <% for (var i=0; i < data.length; i++) { %> 2 <li class="ui-widget-content" style="width: 6000px;" title="<%=data[i]['name']%>">2 <li class="ui-widget-content" style="width:230px;" title="<%=data[i]['name']%>"> 3 3 <input type="checkbox" name="opcao" <%= (data[i].enabled) ? '' : 'disabled="disabled"' %> /> 4 4 <input type="hidden" value="<%=data[i]['id']%>" /> -
branches/2.4/expressoAdmin1_2/templates/default/sectors_form.tpl
r6660 r7228 20 20 </td> 21 21 <td> 22 <input type="text" {disable} autocomplete="off" name="sector" value={sector}> 22 <input type="text" {disable} autocomplete="off" name="sector" value={sector}> 23 </td> 24 </tr> 25 <tr> 26 <td> 27 {lang_Associated_domain}: 28 </td> 29 <td> 30 <input type="text" {disable} autocomplete="off" name="associated_domain" value={associated_domain}> 23 31 </td> 24 32 </tr>
Note: See TracChangeset
for help on using the changeset viewer.