Change upgrade file name since we may be doing additional updates in the future

diff --git a/imp/lib/LoginTasks/SystemTask/Upgrade.php b/imp/lib/LoginTasks/SystemTask/Upgrade.php
deleted file mode 100644 (file)
index 6fd3015..0000000
--- a/imp/lib/LoginTasks/SystemTask/Upgrade.php
+++ /dev/null
@@ -1,49 +0,0 @@
-<?php
-/**
- * Login system task for automated upgrade tasks.
- *
- * Copyright 2009 The Horde Project (http://www.horde.org/)
- *
- * See the enclosed file COPYING for license information (GPL). If you
- * did not receive this file, see http://www.fsf.org/copyleft/gpl.html.
- *
- * @author  Michael Slusarz <slusarz@horde.org>
- * @package Horde_LoginTasks
- */
-class IMP_LoginTasks_SystemTask_Upgrade extends Horde_LoginTasks_SystemTask
-{
-    /**
-     * The interval at which to run the task.
-     *
-     * @var integer
-     */
-    public $interval = Horde_LoginTasks::ONCE;
-
-    /**
-     * Perform all functions for this task.
-     */
-    public function execute()
-    {
-        IMP::initialize();
-
-        /* IMP 4 upgrade: check for old, non-existent sort values.
-         * See Bug #7296. */
-        $sortby = $GLOBALS['prefs']->getValue('sortby');
-        if ($sortby > 10) {
-            $GLOBALS['prefs']->setValue('sortby', Horde_Imap_Client::SORT_ARRIVAL);
-        }
-
-        $update = false;
-        $sortpref = @unserialize($GLOBALS['prefs']->getValue('sortpref'));
-        foreach ($sortpref as $key => $val) {
-            if ($val > 10) {
-                $sortpref[$key] = Horde_Imap_Client::SORT_ARRIVAL;
-                $update = true;
-            }
-        }
-        if ($update) {
-            $GLOBALS['prefs']->setValue('sortpref', serialize($sortpref));
-        }
-    }
-
-}

diff --git a/imp/lib/LoginTasks/SystemTask/UpgradeFromImp4.php b/imp/lib/LoginTasks/SystemTask/UpgradeFromImp4.php
new file mode 100644 (file)
index 0000000..1a125f2
--- /dev/null
+++ b/imp/lib/LoginTasks/SystemTask/UpgradeFromImp4.php
@@ -0,0 +1,49 @@
+<?php
+/**
+ * Login system task for automated upgrade tasks.
+ *
+ * Copyright 2009 The Horde Project (http://www.horde.org/)
+ *
+ * See the enclosed file COPYING for license information (GPL). If you
+ * did not receive this file, see http://www.fsf.org/copyleft/gpl.html.
+ *
+ * @author  Michael Slusarz <slusarz@horde.org>
+ * @package Horde_LoginTasks
+ */
+class IMP_LoginTasks_SystemTask_UpgradeFromImp4 extends Horde_LoginTasks_SystemTask
+{
+    /**
+     * The interval at which to run the task.
+     *
+     * @var integer
+     */
+    public $interval = Horde_LoginTasks::ONCE;
+
+    /**
+     * Perform all functions for this task.
+     */
+    public function execute()
+    {
+        IMP::initialize();
+
+        /* IMP 4 upgrade: check for old, non-existent sort values.
+         * See Bug #7296. */
+        $sortby = $GLOBALS['prefs']->getValue('sortby');
+        if ($sortby > 10) {
+            $GLOBALS['prefs']->setValue('sortby', Horde_Imap_Client::SORT_ARRIVAL);
+        }
+
+        $update = false;
+        $sortpref = @unserialize($GLOBALS['prefs']->getValue('sortpref'));
+        foreach ($sortpref as $key => $val) {
+            if ($val > 10) {
+                $sortpref[$key] = Horde_Imap_Client::SORT_ARRIVAL;
+                $update = true;
+            }
+        }
+        if ($update) {
+            $GLOBALS['prefs']->setValue('sortpref', serialize($sortpref));
+        }
+    }
+
+}