Fix function name

diff --git a/ingo/lib/Script/imap.php b/ingo/lib/Script/imap.php
index a64ddf1..86e50c4 100644 (file)
--- a/ingo/lib/Script/imap.php
+++ b/ingo/lib/Script/imap.php
@@ -126,7 +126,7 @@ class Ingo_Script_imap extends Ingo_Script
         $detailmsg = $GLOBALS['prefs']->getValue('show_filter_msg');
 
         /* Parse through the rules, one-by-one. */
-        foreach ($filters->getFilterlist() as $rule) {
+        foreach ($filters->getFilterList() as $rule) {
             /* Check to make sure this is a valid rule and that the rule is
                not disabled. */
             if (!$this->_validRule($rule['action']) ||

diff --git a/ingo/lib/Script/maildrop.php b/ingo/lib/Script/maildrop.php
index c72ecbc..6df006a 100644 (file)
--- a/ingo/lib/Script/maildrop.php
+++ b/ingo/lib/Script/maildrop.php
@@ -137,7 +137,7 @@ class Ingo_Script_maildrop extends Ingo_Script {
             }
         }
 
-        foreach ($filters->getFilterlist() as $filter) {
+        foreach ($filters->getFilterList() as $filter) {
             switch ($filter['action']) {
             case Ingo_Storage::ACTION_BLACKLIST:
                 $this->generateBlacklist(!empty($filter['disable']));

diff --git a/ingo/lib/Script/procmail.php b/ingo/lib/Script/procmail.php
index ed35409..3efb674 100644 (file)
--- a/ingo/lib/Script/procmail.php
+++ b/ingo/lib/Script/procmail.php
@@ -145,7 +145,7 @@ class Ingo_Script_procmail extends Ingo_Script {
             }
         }
 
-        foreach ($filters->getFilterlist() as $filter) {
+        foreach ($filters->getFilterList() as $filter) {
             switch ($filter['action']) {
             case Ingo_Storage::ACTION_BLACKLIST:
                 $this->generateBlacklist(!empty($filter['disable']));

diff --git a/ingo/lib/Script/sieve.php b/ingo/lib/Script/sieve.php
index 9e2a4dd..9644d1c 100644 (file)
--- a/ingo/lib/Script/sieve.php
+++ b/ingo/lib/Script/sieve.php
@@ -475,7 +475,7 @@ class Ingo_Script_sieve extends Ingo_Script {
         global $ingo_storage;
 
         $filters = &$ingo_storage->retrieve(Ingo_Storage::ACTION_FILTERS);
-        foreach ($filters->getFilterlist() as $filter) {
+        foreach ($filters->getFilterList() as $filter) {
             /* Check to make sure this is a valid rule and that the rule
                is not disabled. */
             if (!$this->_validRule($filter['action']) ||

diff --git a/ingo/lib/Storage.php b/ingo/lib/Storage.php
index 01e8ce2..bb2f119 100644 (file)
--- a/ingo/lib/Storage.php
+++ b/ingo/lib/Storage.php
@@ -816,7 +816,7 @@ class Ingo_Storage_filters
      *
      * @return array  The list of rule hashes.
      */
-    public function getFilterlist()
+    public function getFilterList()
     {
         return $this->_filters;
     }

diff --git a/ingo/lib/Storage/prefs.php b/ingo/lib/Storage/prefs.php
index dc0b01c..8c9acd1 100644 (file)
--- a/ingo/lib/Storage/prefs.php
+++ b/ingo/lib/Storage/prefs.php
@@ -144,7 +144,7 @@ class Ingo_Storage_prefs extends Ingo_Storage
             return $prefs->setValue('blacklist', serialize($data));
 
         case self::ACTION_FILTERS:
-            return $prefs->setValue('rules', serialize(String::convertCharset($ob->getFilterlist(), NLS::getCharset(), $prefs->getCharset())), false);
+            return $prefs->setValue('rules', serialize(String::convertCharset($ob->getFilterList(), NLS::getCharset(), $prefs->getCharset())), false);
 
         case self::ACTION_FORWARD:
             $data = array(

diff --git a/ingo/scripts/upgrades/convert_prefs_to_sql.php b/ingo/scripts/upgrades/convert_prefs_to_sql.php
index 8308f4a..a7fd44e 100755 (executable)
--- a/ingo/scripts/upgrades/convert_prefs_to_sql.php
+++ b/ingo/scripts/upgrades/convert_prefs_to_sql.php
@@ -76,7 +76,7 @@ while (!feof(STDIN)) {
         $filter = $prefs_storage->retrieve($rule, false);
         if ($rule == Ingo_Storage::ACTION_FILTERS) {
             $new_filter = &$sql_storage->retrieve(Ingo_Storage::ACTION_FILTERS, true, true);
-            foreach ($filter->getFilterlist() as $rule) {
+            foreach ($filter->getFilterList() as $rule) {
                 $new_filter->addRule($rule);
                 echo '.';
             }