Changeset 3638 in subversion

Timestamp:

May 19, 2010 9:57:37 AM (3 years ago)

Author:

alec

Message:

• Display overlay only on main template of mail task

Location:

trunk/plugins/new_user_dialog

Files:

• new_user_dialog.php (modified) (6 diffs)
• package.xml (modified) (3 diffs)

trunk/plugins/new_user_dialog/new_user_dialog.php

@@ -14 +14 @@
 {
   public $task = 'login|mail';
-  
+
   function init()
   {
     $this->add_hook('create_identity', array($this, 'create_identity'));
-    
+
     // register additional hooks if session flag is set
     if ($_SESSION['plugin.newuserdialog']) {
@@ -25 +25 @@
     }
   }
-  
+
   /**
    * Check newly created identity at first login
@@ -42 +42 @@
   function render_page($p)
   {
-    if ($_SESSION['plugin.newuserdialog']) {
+    if ($_SESSION['plugin.newuserdialog'] && $p['template'] == 'mail') {
       $this->add_texts('localization');
-      
+
       $rcmail = rcmail::get_instance();
       $identity = $rcmail->user->get_identity();
       $identities_level = intval($rcmail->config->get('identities_level', 0));
-      
+
       // compose user-identity dialog
       $table = new html_table(array('cols' => 2));
-      
+
       $table->add('title', $this->gettext('name'));
       $table->add(null, html::tag('input', array(
@@ -66 +66 @@
         'disabled' => ($identities_level == 1 || $identities_level == 3)
       )));
-      
+
       // add overlay input box to html page
       $rcmail->output->add_footer(html::div(array('id' => 'newuseroverlay'),
@@ -103 +103 @@
     $identity = $rcmail->user->get_identity();
     $identities_level = intval($rcmail->config->get('identities_level', 0));
-    
+
     $save_data = array(
       'name' => get_input_value('_name', RCUBE_INPUT_POST),
       'email' => get_input_value('_email', RCUBE_INPUT_POST),
     );
-    
+
     // don't let the user alter the e-mail address if disabled by config
     if ($identities_level == 1 || $identities_level == 3)
       $save_data['email'] = $identity['email'];
-    
+
     // save data if not empty
     if (!empty($save_data['name']) && !empty($save_data['email'])) {
@@ -118 +118 @@
       $rcmail->session->remove('plugin.newuserdialog');
     }
-    
+
     $rcmail->output->redirect('');
   }
-  
+
 }
 

trunk/plugins/new_user_dialog/package.xml

@@ -14 +14 @@
                 <active>yes</active>
         </lead>
-        <date>2010-05-13</date>
-        <time>19:35:00</time>
+        <date>?</date>
+        <time>?</time>
         <version>
-                <release>1.1</release>
+                <release>?</release>
                 <api>1.0</api>
         </version>
@@ -26 +26 @@
         <license uri="http://www.gnu.org/licenses/gpl-2.0.html">GNU GPLv2</license>
         <notes>
-- Fix space bar and backspace buttons not working (#1486726)
+- Add overlay box only to mail task main template
     </notes>
         <contents>
@@ -79 +79 @@
                 <license uri="http://www.gnu.org/licenses/gpl-2.0.html">GNU GPLv2</license>
         </release>
+        <release>
+                <date>2010-05-13</date>
+                <time>19:35:00</time>
+                <version>
+                        <release>1.1</release>
+                        <api>1.0</api>
+                </version>
+                <stability>
+                        <release>stable</release>
+                        <api>stable</api>
+                </stability>
+                <license uri="http://www.gnu.org/licenses/gpl-2.0.html">GNU GPLv2</license>
+                <notes>
+- Fix space bar and backspace buttons not working (#1486726)
+            </notes>
+        </release>
     </changelog>
 </package>