Changeset ebb2047 in github

Timestamp:

Jul 23, 2012 4:24:16 AM (10 months ago)

Author:

Aleksander Machniak <alec@…>

Children:

7eba085

Parents:

114cf12

Message:

Added GUI for variables setting - RFC5229 (patch from Paweł Słowik)

Location:

plugins/managesieve

Files:

• Changelog (modified) (1 diff)
• localization/en_GB.inc (modified) (1 diff)
• localization/en_US.inc (modified) (1 diff)
• localization/pl_PL.inc (modified) (1 diff)
• managesieve.js (modified) (2 diffs)
• managesieve.php (modified) (4 diffs)

plugins/managesieve/Changelog

@@ +1 @@
+- Added GUI for variables setting - RFC5229 (patch from Paweł Słowik)
+
 * version 5.1 [2012-06-21]
 -----------------------------------------------------------

plugins/managesieve/localization/en_GB.inc

@@ -94 +94 @@
 $labels['flagflagged'] = 'Flagged';
 $labels['flagdraft'] = 'Draft';
+$labels['setvariable'] = 'Set variable';
+$labels['setvarname'] = 'Variable name:';
+$labels['setvarvalue'] = 'Variable value:';
+$labels['setvarmodifiers'] = 'Modifiers:';
 $labels['filtercreate'] = 'Create filter';
 $labels['usedata'] = 'Use following data in the filter:';

plugins/managesieve/localization/en_US.inc

@@ -79 +79 @@
 $labels['flagflagged'] = 'Flagged';
 $labels['flagdraft'] = 'Draft';
+$labels['setvariable'] = 'Set variable';
+$labels['setvarname'] = 'Variable name:';
+$labels['setvarvalue'] = 'Variable value:';
+$labels['setvarmodifiers'] = 'Modifiers:';
 $labels['filtercreate'] = 'Create filter';
 $labels['usedata'] = 'Use following data in the filter:';

plugins/managesieve/localization/pl_PL.inc

@@ -108 +108 @@
 $labels['flagflagged'] = 'Oflagowana';
 $labels['flagdraft'] = 'Szkic';
+$labels['setvariable'] = 'Ustaw zmiennÄ
+';
+$labels['setvarname'] = 'Nazwa zmiennej:';
+$labels['setvarvalue'] = 'Wartość zmiennej:';
+$labels['setvarmodifiers'] = 'Modyfikatory:';
 $labels['filtercreate'] = 'Utwórz filtr';
 $labels['usedata'] = 'UÅŒyj następujÄ

plugins/managesieve/managesieve.js

@@ -639 +639 @@
       target_area: document.getElementById('action_target_area' + id),
       flags: document.getElementById('action_flags' + id),
-      vacation: document.getElementById('action_vacation' + id)
+      vacation: document.getElementById('action_vacation' + id),
+      set: document.getElementById('action_set' + id)
     };
 
@@ -656 +657 @@
   else if (obj.value == 'vacation') {
     enabled.vacation = 1;
+  }
+  else if (obj.value == 'set') {
+    enabled.set = 1;
   }
 

plugins/managesieve/managesieve.php

@@ -616 +616 @@
             $subject        = get_input_value('_action_subject', RCUBE_INPUT_POST, true);
             $flags          = get_input_value('_action_flags', RCUBE_INPUT_POST);
+            $varnames       = get_input_value('_action_varname', RCUBE_INPUT_POST);
+            $varvalues      = get_input_value('_action_varvalue', RCUBE_INPUT_POST);
+            $varmods        = get_input_value('_action_varmods', RCUBE_INPUT_POST);
 
             // we need a "hack" for radiobuttons
@@ -849 +852 @@
                     if ($this->form['actions'][$i]['days'] && !preg_match('/^[0-9]+$/', $this->form['actions'][$i]['days']))
                         $this->errors['actions'][$i]['days'] = $this->gettext('forbiddenchars');
+                    break;
+
+                case 'set':
+                    if (empty($varnames[$idx])) {
+                        $this->errors['actions'][$i]['name'] = $this->gettext('cannotbeempty');
+                    }
+                    if (empty($varvalues[$idx])) {
+                        $this->errors['actions'][$i]['value'] = $this->gettext('cannotbeempty');
+                    }
+                    foreach ($varmods[$idx] as $v_m) {
+                        $this->form['actions'][$i][$v_m] = true;
+                    }
+                    $this->form['actions'][$i]['name'] = $varnames[$idx];
+                    $this->form['actions'][$i]['value'] = $varvalues[$idx];
                     break;
                 }
@@ -1448 +1465 @@
             $select_action->add(Q($this->gettext('removeflags')), 'removeflag');
         }
+        if (in_array('variables', $this->exts)) {
+            $select_action->add(Q($this->gettext('setvariable')), 'set');
+        }
         $select_action->add(Q($this->gettext('rulestop')), 'stop');
 
@@ -1511 +1531 @@
         $out .= '</div>';
 
+        // set variable
+        $set_modifiers = array(
+            'lower',
+            'upper',
+            'lowerfirst',
+            'upperfirst',
+            'quotewildcard',
+            'length'
+        );
+
+        $out .= '<div id="action_set' .$id.'" style="display:' .($action['type']=='set' ? 'inline' : 'none') .'">';
+        $out .= '<span class="label">' .Q($this->gettext('setvarname')) . '</span><br />'
+            .'<input type="text" name="_action_varname['.$id.']" id="action_varname'.$id.'" '
+            .'value="' . Q($action['name']) . '" size="35" '
+            . $this->error_class($id, 'action', 'name', 'action_varname') .' />';
+        $out .= '<br /><span class="label">' .Q($this->gettext('setvarvalue')) . '</span><br />'
+            .'<input type="text" name="_action_varvalue['.$id.']" id="action_varvalue'.$id.'" '
+            .'value="' . Q($action['value']) . '" size="35" '
+            . $this->error_class($id, 'action', 'value', 'action_varvalue') .' />';
+        $out .= '<br /><span class="label">' .Q($this->gettext('setvarmodifiers')) . '</span><br />';
+        foreach ($set_modifiers as $j => $s_m) {
+            $s_m_id = 'action_varmods' . $id . $s_m;
+            $out .= sprintf('<input type="checkbox" name="_action_varmods[%s][]" value="%s" id="%s"%s />%s<br>',
+                $id, $s_m, $s_m_id, (array_key_exists($s_m, (array)$action) && $action[$s_m] ? ' checked="checked"' : ''), $s_m);
+        }
+        $out .= '</div>';
+
         // mailbox select
         if ($action['type'] == 'fileinto')