Changeset 6754 for branches/2.4/admin
- Timestamp:
- 07/11/12 11:45:10 (12 years ago)
- Location:
- branches/2.4
- Files:
-
- 4 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/2.4
-
Property
svn:mergeinfo
set to
(toggle deleted branches)
/trunk merged eligible /sandbox/2.4.1-3 6237-6527
-
Property
svn:mergeinfo
set to
(toggle deleted branches)
-
branches/2.4/admin/inc/class.uiconfig.inc.php
r5988 r6754 11 11 \**************************************************************************/ 12 12 13 require_once('prototype/api/config.php'); 14 use prototype\api\Config as Config; 13 15 14 16 class uiconfig … … 337 339 /* Seta o valor padrão para a configuração de número máximo de marcadores */ 338 340 $current_config['expressoMail_limit_labels'] = (isset($current_config['expressoMail_limit_labels']) && !!$current_config['expressoMail_limit_labels'] ) ? $current_config['expressoMail_limit_labels'] : 20; 341 //Pegar os todos os Atributos LDAP mapeados no arquivo user.ini 342 $map = Config::get('user', 'OpenLDAP.mapping'); 343 $validate = false; 344 $options = "<option value=''>".lang('None')."</option>"; 345 foreach($map as $value){ 346 $options .= "<option value='".$value."'"; 347 if($current_config['expressoMail_ldap_identifier_recipient'] == $value){ 348 $validate = true; 349 $options .= " selected='selected'"; 350 } 351 $options .= ">". $value . "</option>"; 352 } 353 354 if(!$validate){ 355 // Limpa Atributo LDAP do banco de dados caso a atribuição não exista mais. 356 $db = ''; 357 $db = $db ? $db : $GLOBALS['phpgw']->db; // this is to allow setup to set the db 358 $db->query("DELETE FROM phpgw_config WHERE config_app = '".$appname."' AND config_name = 'expressoMail_ldap_identifier_recipient'"); 359 } 339 360 /* Recupera o número mínimo de marcadores que pode ser definido */ 340 361 $db = ''; … … 420 441 $t->set_var('min_labels',$cont_labels); 421 442 443 $t->set_var('rows_ldap_identifier',$options); 422 444 $t->pfp('out','body'); 423 445 -
branches/2.4/admin/setup/phpgw_pt-br.lang
r5988 r6754 565 565 There are users with an quantity greater than of markers. Respect the minimum number indicated. admin pt-br Existem usuários com uma quantidade superior de marcadores. Respeito o número mínimo indicado. 566 566 Minimum number of labels allowed admin pt-br Número mínimo de marcadores permitido 567 Identifier of the recipient of a message admin pt-br Identificador do destinatário de uma mensagem 568 LDAP attribute used to replacement admin pt-br Atributo LDAP utilizado para substituição 569 None admin pt-br Nenhum -
branches/2.4/admin/setup/setup.inc.php
r5298 r6754 13 13 $setup_info['admin']['name'] = 'admin'; 14 14 $setup_info['admin']['title'] = 'Admin'; 15 $setup_info['admin']['version'] = '2.4. 0';15 $setup_info['admin']['version'] = '2.4.1'; 16 16 $setup_info['admin']['app_order'] = 1; 17 17 $setup_info['admin']['tables'] = ''; … … 48 48 $setup_info['admin']['depends'][] = array( 49 49 'appname' => 'phpgwapi', 50 'versions' => Array('2.4 ')50 'versions' => Array('2.4.1') 51 51 ); 52 52 ?>
Note: See TracChangeset
for help on using the changeset viewer.