Improve errors handling.

plesk · Jul 10, 2014 · 7dd9f44 · 7dd9f44
1 parent 471176f
commit 7dd9f44
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 8 deletions.
diff --git a/plib/controllers/IndexController.php b/plib/controllers/IndexController.php
@@ -20,21 +20,20 @@ public function indexDataAction()
     public function updateAddressAction()
     {
         $ips = Modules_Nat_NatManager::getIpAddresses();
-        // TODO: add validation
         $mainIp = $this->_request->getParam('ip');
+
+        if (!isset($ips[$mainIp])) {
+            $this->_redirect('index');
+        }
+
         $publicIp = $ips[$mainIp];
 
         $this->view->pageTitle = $this->lmsg('updateAddressPageTitle');
 
         $form = new pm_Form_Simple();
-        $form->addElement('text', 'mainIp', array(
+        $form->addElement('simpleText', 'mainIpText', array(
             'label' => $this->lmsg('mainIp'),
             'value' => $mainIp,
-            'required' => true,
-            'validators' => array(
-                array('NotEmpty', true),
-                array('Ip', true),
-            ),
         ));
         $form->addElement('text', 'publicIp', array(
             'label' => $this->lmsg('publicIp'),
@@ -45,6 +44,9 @@ public function updateAddressAction()
                 array('Ip', true),
             ),
         ));
+        $form->addElement('hidden', 'mainIp', array(
+            'value' => $mainIp,
+        ));
         $form->addControlButtons(array(
             'cancelLink' => pm_Context::getBaseUrl(),
         ));

diff --git a/plib/library/NatManager.php b/plib/library/NatManager.php
@@ -16,6 +16,12 @@ public static function getIpAddresses()
 
     public static function updateAddress($mainIp, $publicIp)
     {
+        $ips = self::getIpAddresses();
+
+        if (!isset($ips[$mainIp])) {
+            throw new pm_Exception('Unknown IP address.');
+        }
+
         $apiResponse = pm_ApiRpc::getService()->call(
             '<ip>' . 
                 '<set>' . 
@@ -24,7 +30,9 @@ public static function updateAddress($mainIp, $publicIp)
                 '</set>' .
             '</ip>');
 
-        // TODO: add error handler
+        if ('error' === (string)$apiResponse->ip->set->result->status) {
+            throw new pm_Exception($apiResponse->ip->set->result->errtext);
+        }
     }
 
 }