Changeset 13 for trunk/expressoAdmin1_2

Timestamp:

04/10/07 10:21:10 (17 years ago)

Author:

niltonneto

Message:

* empty log message *

Location:

trunk/expressoAdmin1_2

Files:

• inc/class.db_functions.inc.php (modified) (1 diff)
• inc/class.functions.inc.php (modified) (1 diff)
• inc/class.uiaccounts.inc.php (modified) (2 diffs)
• js/jscode/users.js (modified) (1 diff)
• templates/default/accounts.tpl (modified) (1 diff)

trunk/expressoAdmin1_2/inc/class.db_functions.inc.php

@@ -10 +10 @@
         
         function db_functions(){
-                $GLOBALS['phpgw_info']['server'] = $_SESSION['phpgw_info']['expresso']['server'];
+                
+                if (is_array($_SESSION['phpgw_info']['expresso']['server']))
+                        $GLOBALS['phpgw_info']['server'] = $_SESSION['phpgw_info']['expresso']['server'];
+                else
+                        $_SESSION['phpgw_info']['expresso']['server'] = $GLOBALS['phpgw_info']['server'];
+                
                 $this->db = new db();
                 $this->db->Halt_On_Error = 'no';

trunk/expressoAdmin1_2/inc/class.functions.inc.php

@@ -30 +30 @@
                 function functions()
                 {
-                        //$this->nextmatchs = createobject('phpgwapi.nextmatchs');
                         $this->db_functions = new db_functions;
                 }

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

@@ -95 +95 @@
                                 'context'                                       => $context,
                                 'context_display'                       => $context_display,
+                                'imapDelimiter'                         => $_SESSION['phpgw_info']['expresso']['email_server']['imapDelimiter'], 
                                 
                                 'lang_create_user'                      => lang('Create User'),
@@ -153 +154 @@
 
                                         if ($can_rename)
-                                                $p->set_var('row_rename',"<a href='#' onClick='javascript:rename_user(\"".$account['account_lid']."\",\"".$account['account_id']."\",\"".$context."\");'>Renomear</a>");                                                
+                                                $p->set_var('row_rename',"<a href='#' onClick='javascript:rename_user(\"".$account['account_lid']."\",\"".$account['account_id']."\",\"".$context."\");'>Renomear</a>");
                                         else
                                                 $p->set_var('row_rename','&nbsp;');

trunk/expressoAdmin1_2/js/jscode/users.js

@@ -543 +543 @@
 function rename_user(uid, uidnumber, context)
 {
+
+        if (document.getElementById('accounts_form_imapDelimiter').value == '/')
+                var reUid = /^([a-zA-Z0-9_\.\-])+$/;
+        else
+                var reUid = /^([a-zA-Z0-9_\-])+$/;
+
         new_uid = prompt("Alterar login do usuário " + uid + " para: ", uid);
-        
-        var reUid = /^([a-zA-Z0-9_\-])+$/;
+
         if(!reUid.test(new_uid)){
                 alert('Campo LOGIN comtém caracteres não permitidos.');

trunk/expressoAdmin1_2/templates/default/accounts.tpl

@@ -1 +1 @@
 <!-- BEGIN body -->
-
+<input type="hidden" id="accounts_form_imapDelimiter" value="{imapDelimiter}">
 {error_messages}
 <p>