Changeset 5988

Timestamp:

04/20/12 18:13:08 (12 years ago)

Author:

marcieli

Message:

Ticket #2633 - Concluído: Inserir validação de limite de marcadores no Administrador.

Location:

trunk

Files:

• admin/inc/class.uiconfig.inc.php (modified) (2 diffs)
• admin/setup/phpgw_pt-br.lang (modified) (1 diff)
• expressoMail1_2/inc/hook_config_validate.inc.php (added)
• expressoMail1_2/setup/default_records.inc.php (modified) (1 diff)
• expressoMail1_2/setup/setup.inc.php (modified) (1 diff)
• expressoMail1_2/setup/tables_update.inc.php (modified) (2 diffs)
• expressoMail1_2/templates/default/config.tpl (modified) (2 diffs)

trunk/admin/inc/class.uiconfig.inc.php

@@ -334 +334 @@
 
                         $GLOBALS['phpgw']->hooks->single('config',$appname);
-
+                        
                         /* Seta o valor padrão para a configuração de número máximo de marcadores */
                         $current_config['expressoMail_limit_labels'] = (isset($current_config['expressoMail_limit_labels']) && !!$current_config['expressoMail_limit_labels'] ) ? $current_config['expressoMail_limit_labels'] : 20;
+                        /* Recupera o número mínimo de marcadores que pode ser definido */
+                        $db = '';
+                        $db = $db ? $db : $GLOBALS['phpgw']->db;        // this is to allow setup to set the db
+                        $db->query("SELECT max(slot) as slot from expressomail_label",__LINE__,__FILE__);
+                        while( $db->next_record() )
+                        {
+                                $cont_labels = $db->f('slot');
+                        }
 
                         foreach($vars as $value)
@@ -410 +418 @@
                         }
 
+                        $t->set_var('min_labels',$cont_labels);
+                        
                         $t->pfp('out','body');
 

trunk/admin/setup/phpgw_pt-br.lang

@@ -563 +563 @@
 day(s)  admin   pt-br   dia(s)
 Number max of labels    admin   pt-br   Número máximo de marcadores
+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.
+Minimum number of labels allowed        admin   pt-br   Número mínimo de marcadores permitido

trunk/expressoMail1_2/setup/default_records.inc.php

@@ -11 +11 @@
                         /* Seta o valor padrão para a configuração de número máximo de marcadores */
                         $oProc->query("INSERT INTO phpgw_config(config_app, config_name, config_value) VALUES ('expressoMail1_2', 'expressoMail_limit_labels', 20);");
+                        
+                        /* Registra o hook de validação do administrador*/
+                        $oProc->query("INSERT INTO phpgw_hooks( \"hook_appname\", \"hook_location\", \"hook_filename\") VALUES ('expressoMail1_2', 'config_validate', 'hook_config_validate.inc.php')");
+
                 
 ?>

trunk/expressoMail1_2/setup/setup.inc.php

@@ -13 +13 @@
 $setup_info['expressoMail1_2']['name'] = 'expressoMail1_2';
 $setup_info['expressoMail1_2']['title'] = 'Expresso Mail';
-$setup_info['expressoMail1_2']['version'] = '2.4.5';
+$setup_info['expressoMail1_2']['version'] = '2.4.6';
 $setup_info['expressoMail1_2']['app_order'] = 2;
 $setup_info['expressoMail1_2']['tables'][] = 'phpgw_expressomail_contacts';

trunk/expressoMail1_2/setup/tables_update.inc.php

@@ -196 +196 @@
                         $oProc->query("INSERT INTO expressomail_followupflag(name) VALUES ('Don''t forward');");
                         $oProc->query("INSERT INTO expressomail_followupflag(name) VALUES ('Don''t answer');");
-                        
-                        /* Seta o valor padrão para a configuração de número máximo de marcadores */
-                        $oProc->query("INSERT INTO phpgw_config(config_app, config_name, config_value) VALUES ('expressoMail1_2', 'expressoMail_limit_labels', 20);");
+
                                                 
                 $GLOBALS['setup_info']['expressoMail1_2']['currentver'] = '2.4.1';
@@ -254 +252 @@
         }
         
+                $test[] = '2.4.5';
+        function expressoMail1_2_upgrade2_4_5() {
+                $oProc = $GLOBALS['phpgw_setup']->oProc;
+                /* Seta o valor padrão para a configuração de número máximo de marcadores */
+                $oProc->query("INSERT INTO phpgw_config(config_app, config_name, config_value) VALUES ('expressoMail1_2', 'expressoMail_limit_labels', 20);");
+                /* Registra o hook de validação do administrador*/
+                $oProc->query("INSERT INTO phpgw_hooks( \"hook_appname\", \"hook_location\", \"hook_filename\") VALUES ('expressoMail1_2', 'config_validate', 'hook_config_validate.inc.php')");
+
+            $GLOBALS['setup_info']['expressoMail1_2']['currentver'] = '2.4.6';
+            return $GLOBALS['setup_info']['expressoMail1_2']['currentver'];
+        }
+        
 ?>

trunk/expressoMail1_2/templates/default/config.tpl

@@ -27 +27 @@
     <td colspan="2"><font color="{th_text}">&nbsp;<b>{title}</b></font></td>
    </tr>
+        <tr bgcolor="{th_err}">
+                <td colspan="2"><b>{error}</b></td>
+        </tr>
 <!-- END header -->
 <!-- BEGIN body -->
@@ -160 +163 @@
                 <td>{lang_Number_max_of_labels}</td>
                 <td>
-                <input type="text" name="newsettings[expressoMail_limit_labels]" value="{value_expressoMail_limit_labels}" size="3" /> 
+                <input type="text" name="newsettings[expressoMail_limit_labels]" value="{value_expressoMail_limit_labels}" size="3" />
+                <span style="color: red;margin-left: 30px"> *{lang_Minimum number of labels allowed} {min_labels}</span>                
                 </td>
         </tr>