Changeset 1384 for trunk/wifidog-auth

Timestamp:

10/02/08 09:44:42 (2 months ago)

Author:

networkfusion

Message:

* Support for redirecting to the users original URL instead of portal

Files:

• trunk/wifidog-auth/CHANGELOG (modified) (1 diff)
• trunk/wifidog-auth/wifidog/classes/Network.php (modified) (3 diffs)
• trunk/wifidog-auth/wifidog/classes/Node.php (modified) (3 diffs)
• trunk/wifidog-auth/wifidog/include/schema_validate.php (modified) (2 diffs)
• trunk/wifidog-auth/wifidog/portal/index.php (modified) (1 diff)

trunk/wifidog-auth/CHANGELOG

@@ -1 +1 @@
-# $Id$
+2008-10-02 Robin Jones
+        * Support for redirecting to the users original URL instead of portal
+
-2008-09-23 Robin Jones
-        * Oops, forgot to include new style sheet into the previous commit.
-
-2008-09-23 Robin Jones
-        * Made Login template easier to edit using CSS and added example to NetworkFusion theme pack, This closes #343 .
-

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

@@ -1405 +1405 @@
-    }
-
+      /** 
+      * Are nodes allowed to redirect users to the original requested web page instead of 
+      * the portal? 
+      * 
+      * @return bool True or false 
+      * 
+      * @access public 
+      */ 
+     public function getPortalOriginalUrlAllowed() 
+     { 
+         return (($this->_row['allow_original_url_redirect'] == 't') ? true : false); 
+     } 
+  
+     /** 
+      * Set if nodes are allowed to redirect users to the original requested web page 
+      * instead of the portal? 
+      * 
+      * @param bool $value The new value, true or false 
+      * 
+      * @return bool True on success, false on failure 
+      * 
+      * @access public 
+      */ 
+     public function setPortalOriginalUrlAllowed($value) 
+     { 
+         // Init values 
+         $retval = true; 
+  
+         if ($value != $this->getPortalOriginalUrlAllowed()) { 
+             $db = AbstractDb::getObject(); 
+             $value ? $value = 'TRUE' : $value = 'FALSE'; 
+             $retval = $db->execSqlUpdate("UPDATE networks SET allow_original_url_redirect = {$value} WHERE network_id = '{$this->getId()}'", false); 
+             $this->refresh(); 
+         } 
+  
+         return $retval; 
+     } 
+
+
-    /** The length of the window during which the user must not have exceeded the limits below.
-     *
@@ -1665 +1704 @@
-        $data = InterfaceElements::generateInputCheckbox("network_" . $this->getId() . "_allow_custom_portal_redirect", "", _("Yes"), $this->getCustomPortalRedirectAllowed(), "network_allow_custom_portal_redirect_radio");
-        $html_network_node_properties[] = InterfaceElements::generateAdminSectionContainer("network_allow_custom_portal_redirect", $title, $data, $help);
+
+        //  allow_original_URL_redirect
+        $title = _("Original URL redirection");
+        $help = _("Are nodes allowed to redirect users to the web page they originally requested instead of the portal?");
+        $data = InterfaceElements::generateInputCheckbox("network_" . $this->getId() . "_allow_original_URL_redirect", "", _("Yes"), $this->getPortalOriginalUrlAllowed(), "network_allow_original_URL_redirect_radio");
+        $html_network_node_properties[] = InterfaceElements::generateAdminSectionContainer("network_allow_original_URL_redirect", $title, $data, $help);
-
-        // Build section
@@ -1875 +1920 @@
-        $this->setCustomPortalRedirectAllowed(empty ($_REQUEST[$name]) ? false : true);
-
+        //  'allow_original_URL_redirect
+        $name = "network_".$this->getId()."_allow_original_URL_redirect";
+        $this->setPortalOriginalUrlAllowed(empty ($_REQUEST[$name]) ? false : true);
+
-        /*
-         * Dynamic abuse control

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

@@ -1020 +1020 @@
-    }
-
+   /** redirect users to the original requested web page instead of portal 
+      Must be enabled in the Network configuration to have any effect 
+      @return a string */ 
+     function getPortalOriginalUrlAllowed() 
+     { 
+         return (($this->_row['allow_original_url_redirect'] == 't') ? true : false); 
+     } 
+  
+     /** redirect users to the original requested web page instead of portal 
+      Must be enabled in the Network configuration to have any effect 
+      @return true on success, false on failure */ 
+     function setPortalOriginalUrlAllowed($value) 
+     { 
+         $retval = true; 
+         if ($value != $this->getPortalOriginalUrlAllowed()) 
+         { 
+             $db = AbstractDb::getObject(); 
+             $value ? $value = 'TRUE' : $value = 'FALSE';
+             $retval = $db->execSqlUpdate("UPDATE nodes SET allow_original_url_redirect = '{$value}' WHERE node_id = '{$this->getId()}'", false); 
+             $this->refresh(); 
+         } 
+         return $retval; 
+     } 
+
+
+
-    /**
-     * Retrieves the admin interface of this object
@@ -1240 +1266 @@
-            $_html_node_config[] = InterfaceElements::generateAdminSectionContainer("node_custom_portal_redirect_url", $_title, $_data);
-        }
+
+        //  allow_original_URL_redirect
+        $title = _("Original URL redirection");
+        $help = _("Are nodes allowed to redirect users to the web page they originally requested instead of the portal? this will overide the custom portal URL");
+        $data = InterfaceElements::generateInputCheckbox("node_" . $node_id . "_allow_original_URL_redirect", "", _("Yes"), $this->getPortalOriginalUrlAllowed(), "node_allow_original_URL_redirect_radio");
+        $_html_node_config[] = InterfaceElements::generateAdminSectionContainer("node_allow_original_URL_redirect", $title, $data, $help);
-
-        // Build section
@@ -1425 +1457 @@
-        }
-
+        // allow_original_URL_redirect
+        if ($network->getPortalOriginalUrlAllowed())
+        {
+            $name = "node_" . $node_id . "_allow_original_URL_redirect";
+            $this->setPortalOriginalUrlAllowed(empty ($_REQUEST[$name]) ? false : true);
+        }
+
-        // End Node configuration section
-

trunk/wifidog-auth/wifidog/include/schema_validate.php

@@ -48 +48 @@
- * Define current database schema version
- */
-2
+3
-/** Used to test a new shecma version before modyfying the database */
-define('SCHEMA_UPDATE_TEST_MODE', false);
@@ -1416 +1416 @@
-        
-    }
+    $new_schema_version = 63;
+    if ($schema_version < $new_schema_version && $new_schema_version <= $targetSchema) {
+        printUpdateVersion($new_schema_version);
+     $sql .= "\n\nUPDATE schema_info SET value='$new_schema_version' WHERE tag='schema_version';\n";
+
+        $sql .= "ALTER TABLE networks ADD column allow_original_url_redirect bool; \n";
+        $sql .= "ALTER TABLE networks ALTER COLUMN allow_original_url_redirect SET DEFAULT FALSE;\n";
+
+        $sql .= "ALTER TABLE nodes ADD column allow_original_URL_redirect bool; \n";
+        $sql .= "ALTER TABLE nodes ALTER COLUMN allow_original_URL_redirect SET DEFAULT FALSE;\n";
+    }
-    /*
-     $new_schema_version = ;

trunk/wifidog-auth/wifidog/portal/index.php

@@ -107 +107 @@
-    }
-}
+
+/*
+ * If this node allows redirection to original URL, and the network config allows it,
+ * redirect to original URL
+ */
+$session_original_url = $session->get(SESS_ORIGINAL_URL_VAR);
+
+if ($node->getPortalOriginalUrlAllowed() && $network->getPortalOriginalUrlAllowed() && !empty ($session_original_url))
+    /**
+     * If the database doesn't get cleaned up by a cron job, we'll do now (normally this is done in ManiUI, but for custom URLs, MainUI may never be instanciated
+     */
+    if (CONF_USE_CRON_FOR_DB_CLEANUP == false) {
+        garbage_collect();
+    }
+    header("Location: {$session_original_url}");
+    exit;
+}
+
-
-/*