Changeset 4828 for trunk/preferences

Timestamp:

07/19/11 16:54:27 (13 years ago)

Author:

airton

Message:

Ticket #2146 - Implementacao da funcionalidade de multiplas assinaturas

Location:

trunk/preferences

Files:

• preferences.php (modified) (8 diffs)
• templates/default/preferences.tpl (modified) (1 diff)

trunk/preferences/preferences.php

@@ -22 +22 @@
         if ($_POST['cancel'])
         {
-                $GLOBALS['phpgw']->redirect_link('/preferences/index.php');
+            $GLOBALS['phpgw']->redirect_link('/preferences/index.php');
         }
         
@@ -29 +29 @@
         $default = get_var('default',Array('POST'));
 
+        if(!@is_object($GLOBALS['phpgw']->js))
+        {
+                $GLOBALS['phpgw']->js = CreateObject('phpgwapi.javascript');
+        }
+        $GLOBALS['phpgw']->js->validate_file('jscode','validate','preferences');
+       
         $t = CreateObject('phpgwapi.Template',$GLOBALS['phpgw']->common->get_tpl_dir('preferences'));
         $t->set_file(array(
                 'preferences' => 'preferences.tpl'
         ));
+
+
+
         $t->set_block('preferences','list','lists');
         $t->set_block('preferences','row','rowhandle');
@@ -43 +52 @@
                 $GLOBALS['phpgw']->translation->add_app('preferences'); // we need the prefs translations too
         }
+        
+        $GLOBALS['phpgw']->preferences->default['expressoMail']['show_name_print_messages'] = "0";
 
         /* Make things a little easier to follow */
@@ -205 +216 @@
         {
                 global $t,$prefs;
-        $t->set_var('row_id', "${GLOBALS[type]}[$name]");
+                $t->set_var('row_id', "${GLOBALS[type]}[$name]");
                 $t->set_var('row_value',$code.$prefs[$name].$appendcode);
                 $t->set_var('row_name',lang("signature"));
@@ -240 +251 @@
                 }
                 $s .= create_option_string($default,$values);
+                
                 if ($GLOBALS['type'] == 'user')
                 {
@@ -346 +358 @@
         {
                 $_appname = check_app();
-
                 $prefs = &$repository[$_appname];
 
@@ -487 +498 @@
                 if (!is_admin() || $error)
                 {
-                        $GLOBALS['phpgw']->redirect_link('/'.$_GET['appname'].'/'); 
+                        $GLOBALS['phpgw']->redirect_link('/'.$_GET['appname'].'/');
                 }
                 
@@ -513 +524 @@
         $t->set_var('messages',$error);
         $t->set_var('action_url',$GLOBALS['phpgw']->link('/preferences/preferences.php','appname=' . $_GET['appname']));
-        $t->set_var('th_bg',  $GLOBALS['phpgw_info']['theme']['th_bg']);
+
+        if($_GET['appname'] == 'expressoMail1_2')
+            $t->set_var('validateForm','onSubmit="return validateSignature();"');
+
+        $t->set_var('th_bg',  $GLOBALS['phpgw_info']['theme']['th_bg']);
         $t->set_var('th_text',$GLOBALS['phpgw_info']['theme']['th_text']);
         $t->set_var('row_on', $GLOBALS['phpgw_info']['theme']['row_on']);

trunk/preferences/templates/default/preferences.tpl

@@ -1 +1 @@
 <center><b>{messages}</b></center>
 <!-- BEGIN form -->
-<form method="POST" action="{action_url}">
+<form method="POST" action="{action_url}" {validateForm}>
 <table width="75%" cellpadding=0 cellspacing=0  class="prefTable"> 
 <tr><td colspan="3">{tabs}</td></tr>