Changeset 251

Timestamp:

04/08/08 01:16:17 (9 months ago)

Author:

shupp

Message:

Lots of changes to Fowards - use exceptions instead of PEAR_Error

Files:

• trunk/Framework/Module/Forwards.php (modified) (7 diffs)

trunk/Framework/Module/Forwards.php

@@ -70 +70 @@
-        // Pagintation setup
-        $full_alias_array = $this->user->listAlias($this->domain);
-        if (PEAR::isError($full_alias_array)) return $full_alias_array;
-        // Format the valias outpt from vpopmaild
-        $aliasesParsed = $this->user->parseAliases($full_alias_array, 'forwards');
@@ -248 +247 @@
-    protected function deleteForwardLine() {
-        $contents = $this->user->readFile($this->domain, '', ".qmail-" . $this->data['forward']);
-        if (PEAR::isError($contents)) {
-            // Go back to list aliases, which will display the messgae
-            return PEAR::raiseError($contents->getMessage(), 1);
-        }
-    
-        // Now build a new array without that forward
-        if (!in_array($this->data['line'], $contents)) {
-return PEAR::raiseError
+throw new Framewor_Exception
-        }
-
-        if (count($contents) == 1) {
-            // tell caller to delete instead
-return PEAR::raiseError
+throw new Framework_Exception
-        }
-        $newContents = array();
@@ -270 +265 @@
-        }
-        $result = $this->user->writeFile($newContents, $this->domain, '', ".qmail-" . $this->data['forward']);
-        if (PEAR::isError($result)) {
-            return $result;
-        }
-        return true;
-    }
@@ -290 +282 @@
-        }
-
-ereg_replace('^.qmail-
+preg_replace('/^.qmail-/
-    
-        // Get forward info if it exists
-        $contents = $this->user->ReadFile($this->domain, '', ".qmail-$forward");
-        if ($this->user->Error) return PEAR::raiseError(_("Error: ") . $this->user->Error);
-    
-        // Set template data
@@ -337 +328 @@
-        // Get forward info if it exists
-        $contents = $this->user->ReadFile($this->domain, '', ".qmail-$forward");
-        if ($this->user->Error) return PEAR::raiseError(_("Error: ") . $this->user->Error);
-
-        $form = $this->modifyForwardForm();
@@ -415 +405 @@
-        $this->setData('line', $_REQUEST['line']);
-
-
-
-
-
+
+
+
+
+
-                return $this->listAliases();
-result
-result
+e
+e
-                return $this->modifyForward();
-result
+e
-                return $this->deleteForward();
-            } else {
-return $result
+throw new Framework_Exception($e->getMessage(), $e->getCode())
-            }
-        }
@@ -447 +438 @@
-        $forward = ereg_replace('^.qmail-', '', $_REQUEST['forward']);
-        $contents = $this->user->readFile($this->domain, '', ".qmail-" . $forward);
-        if (PEAR::isError($contents))
-            return $contents;
-        $result = $this->user->rmFile($this->domain, '', '.qmail-' . $forward);
-        if (PEAR::isError($contents)) return $contents;
-        $this->setData('message', _("Forward Deleted Successfully"));
-        return $this->listForwards();