Move vacationReason to helper method to the Vacation rule object

horde · Mar 18, 2015 · 3219c1e · 3219c1e
1 parent 52f18b8
commit 3219c1e
Show file tree

Hide file tree

Showing 5 changed files with 36 additions and 36 deletions.
diff --git a/ingo/lib/Rule/System/Vacation.php b/ingo/lib/Rule/System/Vacation.php
@@ -206,4 +206,37 @@ public function __set($name, $data)
         }
     }
 
+    /**
+     * Returns the vacation reason with all placeholder replaced.
+     *
+     * @param string $reason  The vacation reason including placeholders.
+     * @param integer $start  The vacation start timestamp.
+     * @param integer $end    The vacation end timestamp.
+     *
+     * @return string  The vacation reason suitable for usage in the filter
+     *                 scripts.
+     */
+    public static function vacationReason($reason, $start, $end)
+    {
+        global $injector, $prefs;
+
+        $format = $prefs->getValue('date_format');
+        $identity = $injector->getInstance('Horde_Core_Factory_Identity')
+            ->create(Ingo::getUser());
+
+        $replace = array(
+            '%NAME%' => $identity->getName(),
+            '%EMAIL%' => $identity->getDefaultFromAddress(),
+            '%SIGNATURE%' => $identity->getValue('signature'),
+            '%STARTDATE%' => $start ? strftime($format, $start) : '',
+            '%ENDDATE%' => $end ? strftime($format, $end) : ''
+        );
+
+        return str_replace(
+            array_keys($replace),
+            array_values($replace),
+            $reason
+        );
+    }
+
 }
diff --git a/ingo/lib/Script/Maildrop.php b/ingo/lib/Script/Maildrop.php
@@ -309,7 +309,7 @@ protected function _generateVacation(Ingo_Rule $rule)
         $this->_addItem(
             Ingo::RULE_VACATION,
             new Ingo_Script_String(
-                Ingo_Script_Util::vacationReason(
+                Ingo_Rule_System_Vacation::vacationReason(
                     $rule->reason,
                     $rule->start,
                     $rule->end

diff --git a/ingo/lib/Script/Procmail/Recipe.php b/ingo/lib/Script/Procmail/Recipe.php
@@ -192,7 +192,7 @@ public function __construct($params = array(), $scriptparams = array())
                     $this->_action[] = '      | (formail -rI"Precedence: junk" \\';
                     $this->_action[] = '       -a"From: <' . $address . '>" \\';
                     $this->_action[] = '       -A"X-Loop: ' . $address . '" \\';
-                    $reason = Ingo_Script_Util::vacationReason(
+                    $reason = Ingo_Rule_System_Vacation::vacationReason(
                         $params['action-value']['reason'],
                         $params['action-value']['start'],
                         $params['action-value']['end']

diff --git a/ingo/lib/Script/Sieve/Action/Vacation.php b/ingo/lib/Script/Sieve/Action/Vacation.php
@@ -195,7 +195,7 @@ protected function _vacationCode()
         return $code
             . '"'
             . Ingo_Script_Sieve::escapeString(
-                  Ingo_Script_Util::vacationReason(
+                  Ingo_Rule_System_Vacation::vacationReason(
                       $this->_vars['reason'],
                       $this->_vars['start'],
                       $this->_vars['end']

diff --git a/ingo/lib/Script/Util.php b/ingo/lib/Script/Util.php
@@ -88,37 +88,4 @@ public static function update($auto_update = true)
         }
     }
 
-    /**
-     * Returns the vacation reason with all placeholder replaced.
-     *
-     * @param string $reason  The vacation reason including placeholders.
-     * @param integer $start  The vacation start timestamp.
-     * @param integer $end    The vacation end timestamp.
-     *
-     * @return string  The vacation reason suitable for usage in the filter
-     *                 scripts.
-     */
-    public static function vacationReason($reason, $start, $end)
-    {
-        global $injector, $prefs;
-
-        $format = $prefs->getValue('date_format');
-        $identity = $injector->getInstance('Horde_Core_Factory_Identity')
-            ->create(Ingo::getUser());
-
-        $replace = array(
-            '%NAME%' => $identity->getName(),
-            '%EMAIL%' => $identity->getDefaultFromAddress(),
-            '%SIGNATURE%' => $identity->getValue('signature'),
-            '%STARTDATE%' => $start ? strftime($format, $start) : '',
-            '%ENDDATE%' => $end ? strftime($format, $end) : ''
-        );
-
-        return str_replace(
-            array_keys($replace),
-            array_values($replace),
-            $reason
-        );
-    }
-
 }