Changeset 1091 for trunk/wifidog-auth/wifidog/classes/Node.php

Timestamp:

09/06/06 10:58:06 (5 years ago)

Author:

benoitg

Message:

* Remove most inclusions of MainUI in classes. That completely
broke authentication (circular dependencies). Fixes 245.

Unfixes 242. Exceptions should not be caught in the context

they are thrown in. Else there no point in throwing exception in the
first place.
* HyperLink?.php: Fix bug where a link with identical text as
it's link would see the text replaced by the clickthrough-tracked
equivalent.

Files:

• trunk/wifidog-auth/wifidog/classes/Node.php (modified) (5 diffs)

trunk/wifidog-auth/wifidog/classes/Node.php

@@ -50 +50 @@
 require_once('classes/Utils.php');
 require_once('classes/DateTime.php');
-require_once('classes/InterfaceElements.php');
-require_once('classes/MainUI.php');
 
 /**
@@ -230 +228 @@
                 $node_name = _("New node");
 
-                try {
             if (Node::nodeExists($node_id)) {
                 throw new Exception(_('This node already exists.'));
@@ -244 +241 @@
 
             return $object;
-        } catch (Exception $e) {
-            $ui = new MainUI();
-            $ui->setToolSection('ADMIN');
-            $ui->displayError($e->getMessage(), false);
-            exit;
-        }
         }
 
@@ -815 +806 @@
         public function getAdminUI()
         {
+            require_once('classes/InterfaceElements.php');
             // Init values
                 $html = '';
-
-                try {
                 if (!User::getCurrentUser()) {
                         throw new Exception(_('Access denied!'));
                 }
-        } catch (Exception $e) {
-            $ui = new MainUI();
-            $ui->setToolSection('ADMIN');
-            $ui->displayError($e->getMessage(), false);
-            exit;
-        }
 
                 // Get information about the network
@@ -1076 +1060 @@
                 $user = User::getCurrentUser();
 
-                try {
                 if (!$this->isOwner($user) && !$user->isSuperAdmin()) {
                         throw new Exception(_('Access denied!'));
                 }
-        } catch (Exception $e) {
-            $ui = new MainUI();
-            $ui->setToolSection('ADMIN');
-            $ui->displayError($e->getMessage(), false);
-            exit;
-        }
+
 
                 // Check if user is a admin