Changeset 594

Timestamp:

01/13/09 18:10:51 (15 years ago)

Author:

niltonneto

Message:

Resolve #392

Location:

trunk/expressoAdmin1_2

Files:

• inc/class.ldap_functions.inc.php (modified) (3 diffs)
• inc/class.login_algorithm_example.inc.php (added)
• inc/class.uiaccounts.inc.php (modified) (5 diffs)
• inc/if.login.inc.php (modified) (1 diff)
• inc/names.xml (added)
• js/jscode/users.js (modified) (3 diffs)
• templates/default/accounts_form.tpl (modified) (1 diff)
• templates/default/config.tpl (modified) (1 diff)

trunk/expressoAdmin1_2/inc/class.ldap_functions.inc.php

@@ -370 +370 @@
         }
         
-        function gera_login($params) {
+        function generate_login($params) {
                 $params = unserialize($params['attributes']);
                 $context = $GLOBALS['phpgw_info']['server']['ldap_context'];
@@ -378 +378 @@
                 
                 if( (isset($this->current_config['expressoAdmin_loginGenScript'])) && 
-                                ($this->current_config['expressoAdmin_loginGenScript']!="nenhum")) {
+                                ($this->current_config['expressoAdmin_loginGenScript'])) {
                         
                         include_once "if.login.inc.php";
@@ -392 +392 @@
                         $gerador = $classe->newInstance();
 
-                        $login = $gerador->gera_login($params["first_name"],$params["second_name"],$this->ldap);
+                        $login = $gerador->generate_login($params["first_name"],$params["second_name"],$this->ldap);
                         
                         /*

trunk/expressoAdmin1_2/inc/class.uiaccounts.inc.php

@@ -21 +21 @@
                         'show_access_log'                       => True,
                         'css'                                           => True,
-                        'list_inative_users' => True
+                        'list_inactive_users' => True
                 );
 
@@ -53 +53 @@
                 }
 
-                function list_inative_users() {
+                function list_inactive_users() {
 
                         $context = $_GET["context"];
@@ -59 +59 @@
                         unset($GLOBALS['phpgw_info']['flags']['noheader']);
                         unset($GLOBALS['phpgw_info']['flags']['nonavbar']);
-                        $GLOBALS['phpgw_info']['flags']['app_header'] = $GLOBALS['phpgw_info']['apps']['expressoAdmin1_2']['title'].' - '. lang('list inatives');
+                        $GLOBALS['phpgw_info']['flags']['app_header'] = $GLOBALS['phpgw_info']['apps']['expressoAdmin1_2']['title'].' - '. lang('list inactives');
                         $GLOBALS['phpgw']->common->phpgw_header();
 
                         $p = CreateObject('phpgwapi.Template',PHPGW_APP_TPL);
-                        $p->set_file(array('inative_users' => 'list_inativos.tpl'));
-                        $p->set_block('inative_users','list','list');
-                        $p->set_block('inative_users','row','row');
-                        $p->set_block('inative_users','row_empty','row_empty');
+                        $p->set_file(array('inactive_users' => 'list_inactives.tpl'));
+                        $p->set_block('inactive_users','list','list');
+                        $p->set_block('inactive_users','row','row');
+                        $p->set_block('inactive_users','row_empty','row_empty');
                         $contexts = array();
                         array_push($contexts,$context);
                                                 
-                        $usuarios = $this->functions->get_inative_users($contexts);
+                        $usuarios = $this->functions->get_inactive_users($contexts);
 
         
@@ -301 +301 @@
                                 // First ABA
                                 'display_spam_uid'                              => 'display:none',
-                                'lang_gerar_login'              => lang('Generate login'),
+                                'lang_generate_login'              => lang('Generate login'),
                                 'start_coment_expired'                                          => "<!--",
                                 'end_coment_expired'                                            => "-->",
@@ -339 +339 @@
                         
                         if( (isset($this->current_config['expressoAdmin_loginGenScript'])) && 
-                                ($this->current_config['expressoAdmin_loginGenScript']!="nenhum")) {
+                                ($this->current_config['expressoAdmin_loginGenScript'])) {
                                 $var['input_uid_disabled'] = 'disabled';
                                 $var['comment_button'] = ' ';

trunk/expressoAdmin1_2/inc/if.login.inc.php

@@ -11 +11 @@
 interface login {
         //É necessário para gerar os logins o primeiro nome, o segundo e uma conexão para o ldap da máquina.
-        public function gera_login($primeiro_nome,$segundo_nome,$conexao_ldap);
+        public function generate_login($first_name,$last_name,$ldap_conn);
 }
 

trunk/expressoAdmin1_2/js/jscode/users.js

@@ -195 +195 @@
 }
 
-function gera_login(first_name,second_name) {
+function generate_login(first_name,second_name) {
         if ((first_name=='') || (second_name=='')) {
                 alert(get_lang("You must type the first and the second name before generate the login"));
@@ -205 +205 @@
         var attributes = connector.serialize(attrs_array);
         
-        var hangler_gera_login = function(data) {
+        var handler_generate_login = function(data) {
                 if(data['status']) {
                         document.getElementById('uid').value = data['msg'];
@@ -215 +215 @@
         }
 
-        cExecute ('$this.ldap_functions.gera_login&attributes='+attributes, hangler_gera_login);
+        cExecute ('$this.ldap_functions.generate_login&attributes='+attributes, handler_generate_login);
 }
 

trunk/expressoAdmin1_2/templates/default/accounts_form.tpl

@@ -55 +55 @@
                                 <table border="0" style="{display_input_account_lid}"><tr><td>
                                         <input type="text" name="uid" id="uid" value="{uid}"autocomplete="off" {disabled} {input_uid_disabled} size=20 onKeyUp="javascript:emailSuggestion_expressoadmin('{use_suggestion_in_logon_script}','{concatenateDomain}')" onblur="users_form.mail.value=users_form.mail1.value;"></input>
-                                </td>{comment_button}<td><input type="button" value="{lang_gerar_login}" onclick="javascript:gera_login(document.getElementById('givenname').value,document.getElementById('sn').value)" ></td>{end_comment_button}</tr></table>
+                                </td>{comment_button}<td><input type="button" value="{lang_generate_login}" onclick="javascript:generate_login(document.getElementById('givenname').value,document.getElementById('sn').value)" ></td>{end_comment_button}</tr></table>
                                 <spam style="{display_spam_uid}"><font size="3">{uid}</font></spam>
                         </td>

trunk/expressoAdmin1_2/templates/default/config.tpl

@@ -166 +166 @@
                 <td>
                 <select name="newsettings[expressoAdmin_loginGenScript]">
-                         <option value="nenhum">{lang_none}</option>
+                         <option value="0">{lang_none}</option>
                          {rows_login_generator}
                 </select>