Changeset 873

Timestamp:

05/20/09 11:53:53 (15 years ago)

Author:

amuller

Message:

Ticket #485 - padronização das preferências do expressoMail com Egroupware

Location:

trunk

Files:

• expressoMail1_2/inc/hook_preferences.inc.php (modified) (1 diff)
• expressoMail1_2/inc/hook_settings.inc.php (added)
• expressoMail1_2/index.php (modified) (2 diffs)
• expressoMail1_2/js/common_functions.js (modified) (1 diff)
• preferences/preferences.php (modified) (2 diffs)

trunk/expressoMail1_2/inc/hook_preferences.inc.php

@@ -1 +1 @@
 <?php
 {
-// Only Modify the $file and $title variables.....
-        $title = 'expressoMail1_2';
-        $file = Array(
-                'Preferences' => $GLOBALS['phpgw']->link('/'.$title.'/preferences.php'),
+        $title = $appname;
+        $file = array(
+                'Preferences'     => $GLOBALS['phpgw']->link('/preferences/preferences.php','appname='.$appname)
         );
-//Do not modify below this line
+        //Do not modify below this line
         display_section($appname,$title,$file);
 }

trunk/expressoMail1_2/index.php

@@ -82 +82 @@
                 $GLOBALS['phpgw_info']['user']['preferences']['expressoMail']['use_local_messages'] = 0;
         }
-
-        $_SESSION['phpgw_info']['user']['preferences']['expressoMail'] = array(
-                        'voip_enabled'                                          => $voip_enabled,
-                        'voip_email_redirect'                           => $emailVoip,
-                        'outoffice'                                                     => $GLOBALS['phpgw_info']['user']['preferences']['expressoMail']['outoffice'],
-                        'telephone_number'                                      => $GLOBALS['phpgw_info']['user']['telephonenumber'],
-                        'max_email_per_page'                            => $GLOBALS['phpgw_info']['user']['preferences']['expressoMail']['max_email_per_page'],
-                'save_deleted_msg'                                      => $GLOBALS['phpgw_info']['user']['preferences']['expressoMail']['save_deleted_msg'] ? $GLOBALS['phpgw_info']['user']['preferences']['expressoMail']['save_deleted_msg'] : "0",
-            'delete_trash_messages_after_n_days'=> $GLOBALS['phpgw_info']['user']['preferences']['expressoMail']['delete_trash_messages_after_n_days'],
-                'delete_and_show_previous_message'      => $GLOBALS['phpgw_info']['user']['preferences']['expressoMail']['delete_and_show_previous_message'] ? $GLOBALS['phpgw_info']['user']['preferences']['expressoMail']['delete_and_show_previous_message'] : "0",
-                'alert_new_msg'                                         => $GLOBALS['phpgw_info']['user']['preferences']['expressoMail']['alert_new_msg'] ? $GLOBALS['phpgw_info']['user']['preferences']['expressoMail']['alert_new_msg'] : "0",
-                'mainscreen_showmail'                           => $GLOBALS['phpgw_info']['user']['preferences']['expressoMail']['mainscreen_showmail'] ? $GLOBALS['phpgw_info']['user']['preferences']['expressoMail']['mainscreen_showmail'] : "0",
-                'signature'                                             => $GLOBALS['phpgw_info']['user']['preferences']['expressoMail']['signature'],
-                'type_signature'                                        => $GLOBALS['phpgw_info']['user']['preferences']['expressoMail']['type_signature'],
-                'use_signature'                                         => $GLOBALS['phpgw_info']['user']['preferences']['expressoMail']['use_signature'] ? $GLOBALS['phpgw_info']['user']['preferences']['expressoMail']['use_signature'] : "0",
-                'hide_folders'                                          => $GLOBALS['phpgw_info']['user']['preferences']['expressoMail']['hide_folders'] ? $GLOBALS['phpgw_info']['user']['preferences']['expressoMail']['hide_folders'] : "0",                 
-                'save_in_folder'                                        => $GLOBALS['phpgw_info']['user']['preferences']['expressoMail']['save_in_folder'] ? $GLOBALS['phpgw_info']['user']['preferences']['expressoMail']['save_in_folder'] : "-1",
-                'line_height'                                           => $GLOBALS['phpgw_info']['user']['preferences']['expressoMail']['line_height'] ? $GLOBALS['phpgw_info']['user']['preferences']['expressoMail']['line_height'] : "30",
-                'font_size'                                             => $GLOBALS['phpgw_info']['user']['preferences']['expressoMail']['font_size'] ? $GLOBALS['phpgw_info']['user']['preferences']['expressoMail']['font_size'] : "11",
-                'use_shortcuts'                                         => $GLOBALS['phpgw_info']['user']['preferences']['expressoMail']['use_shortcuts'] ? $GLOBALS['phpgw_info']['user']['preferences']['expressoMail']['use_shortcuts'] : "0",
-                'auto_save_draft'                                       => $GLOBALS['phpgw_info']['user']['preferences']['expressoMail']['auto_save_draft'] ? $GLOBALS['phpgw_info']['user']['preferences']['expressoMail']['auto_save_draft'] : "0",
-                'use_dynamic_contacts'                                  => $GLOBALS['phpgw_info']['user']['preferences']['expressoMail']['use_dynamic_contacts'] ? $GLOBALS['phpgw_info']['user']['preferences']['expressoMail']['use_dynamic_contacts'] : "0",
-                'number_of_contacts'                                    => $current_config['expressoMail_Number_of_dynamic_contacts'] ? $current_config['expressoMail_Number_of_dynamic_contacts'] : "0",
-                'use_cache'                                             => $current_config['expressoMail_enable_cache'],
-                'notification_domains'                                  => $current_config['expressoMail_notification_domains'],
-                'remove_attachments_function'                           => $current_config['expressoMail_remove_attachments_function'],
-                'use_important_flag'                                    => $current_config['expressoMail_enable_important_flag'],
-                'use_local_messages'                            => $GLOBALS['phpgw_info']['user']['preferences']['expressoMail']['use_local_messages'] ? $GLOBALS['phpgw_info']['user']['preferences']['expressoMail']['use_local_messages'] : "0",
-                'keep_archived_messages'                        => $GLOBALS['phpgw_info']['user']['preferences']['expressoMail']['keep_archived_messages'] ? $GLOBALS['phpgw_info']['user']['preferences']['expressoMail']['keep_archived_messages'] : "0"
-
-
-
-
-        );
-
+        $preferences = $GLOBALS['phpgw']->preferences->read();
+        $_SESSION['phpgw_info']['user']['preferences']['expressoMail'] = $preferences['expressoMail1_2'];
+        $_SESSION['debug'] = $_SESSION['phpgw_info']['user']['preferences']['expressoMail'];
 
         $template = CreateObject('phpgwapi.Template',PHPGW_APP_TPL);
@@ -206 +174 @@
         // Get Preferences or redirect to preferences page.
         $GLOBALS['phpgw']->preferences->read_repository();
-        if ($GLOBALS['phpgw_info']['user']['preferences']['expressoMail'] == null){
-                echo '<script>alert("' . lang('Dear user,\nthis is your first time in the ExpressoMail, your preferences must be saved.\nPlease, choose your preferences and click on the button Save.') . '")</script>';
-                echo "<script>location.href='./preferences.php'</script>";
-        }       
-
 ?>
 

trunk/expressoMail1_2/js/common_functions.js

@@ -559 +559 @@
 function preferences_mail(){
         if(preferences.type_signature && preferences.type_signature == 'html') {
-                location.href="preferences.php";
+                location.href="../preferences/preferences.php?appname=expressoMail1_2";
         }
         else {

trunk/preferences/preferences.php

@@ -192 +192 @@
 
                         $t->fp('rows',process_help($help) ? 'help_row' : 'row',True);
-                }
-
-        function create_select_box($label,$name,$values,$help='',$default='',$run_lang=True)
+        }
+        function create_html_code($code)
+        {
+                global $t;
+                $t->set_var('row_value',$code);
+                $t->set_var('row_name',lang("signature"));
+                $GLOBALS['phpgw']->nextmatchs->template_alternate_row_color($t);
+                $t->fp('rows','row',True);
+        }
+
+        function create_select_box($label,$name,$values,$help='',$default='',$run_lang=True,$select_prop = '')
         {
                 global $t,$prefs;
@@ -227 +235 @@
                         $def_text = $def_text != '' ? ' <i><font size="-1">'.lang('default').':&nbsp;'.$values[$def_text].'</font></i>' : '';
                 }
-                $t->set_var('row_value',"<select name=\"${GLOBALS[type]}[$name]\">$s</select>$def_text");
+                $t->set_var('row_value',"<select name=\"${GLOBALS[type]}[$name]\" $select_prop>$s</select>$def_text");
                 $t->set_var('row_name',lang($label));
                 $GLOBALS['phpgw']->nextmatchs->template_alternate_row_color($t);