Changeset 716

Timestamp:

09/07/05 02:21:41 (8 years ago)

Author:

benoitg

Message:

2005-09-05 Benoit Gr�goire <bock@…>

• include/common.php: Add code to undo the effect of magic_quote if enabled in the server config. It is still strongly recommended to disable magic_quote
• Node.php: Add UI for splash only node and custom portal
• Update schema

Location:

trunk/wifidog-auth

Files:

• ChangeLog (modified) (1 diff)
• sql/wifidog-postgres-initial-data.sql (modified) (1 diff)
• sql/wifidog-postgres-schema.sql (modified) (8 diffs)
• wifidog/classes/Node.php (modified) (7 diffs)
• wifidog/include/common.php (modified) (1 diff)
• wifidog/include/schema_validate.php (modified) (2 diffs)

trunk/wifidog-auth/ChangeLog

@@ -1 @@
-2005-08-31 Francois Proulx <francois.proulx@gmail.com>
+2005-09-05 Benoit Grégoire  <bock@step.polymtl.ca>
+        * include/common.php:  Add code to undo the effect of magic_quote if enabled in the server config.  It is still strongly recommended to disable magic_quote
+        * Node.php:  Add UI for splash only node and custom portal
+        * Update schema
+        
+2005-09-04 Francois Proulx <francois.proulx@gmail.com>
         * Removed update.php script ( should not have been in CVS )
         * Moved authenticator require in Network getAuthenticator()

trunk/wifidog-auth/sql/wifidog-postgres-initial-data.sql

@@ -119 +119 @@
 --
 
-INSERT INTO schema_info (tag, value) VALUES ('schema_version', '25');
+INSERT INTO schema_info (tag, value) VALUES ('schema_version', '28');
 
 

trunk/wifidog-auth/sql/wifidog-postgres-schema.sql

@@ -28 +28 @@
 
 SET search_path = public, pg_catalog;
+
+--
+-- Name: plpgsql_call_handler(); Type: FUNCTION; Schema: public; Owner: postgres
+--
+
+CREATE FUNCTION plpgsql_call_handler() RETURNS language_handler
+    AS '$libdir/plpgsql', 'plpgsql_call_handler'
+    LANGUAGE c;
+
+
+--
+-- Name: plpgsql_validator(oid); Type: FUNCTION; Schema: public; Owner: postgres
+--
+
+CREATE FUNCTION plpgsql_validator(oid) RETURNS void
+    AS '$libdir/plpgsql', 'plpgsql_validator'
+    LANGUAGE c;
+
+
+--
+-- Name: plpgsql; Type: PROCEDURAL LANGUAGE; Schema: public; Owner: 
+--
+
+CREATE TRUSTED PROCEDURAL LANGUAGE plpgsql HANDLER plpgsql_call_handler VALIDATOR plpgsql_validator;
+
 
 SET default_tablespace = '';
@@ -267 +292 @@
     content_id text NOT NULL,
     subscribe_timestamp timestamp without time zone DEFAULT now() NOT NULL
+);
+
+
+--
+-- Name: network_stakeholders; Type: TABLE; Schema: public; Owner: wifidog; Tablespace: 
+--
+
+CREATE TABLE network_stakeholders (
+    network_id text NOT NULL,
+    user_id character varying(45) NOT NULL,
+    is_admin boolean DEFAULT false NOT NULL,
+    is_stat_viewer boolean DEFAULT false NOT NULL
+);
+
+
+--
+-- Name: networks; Type: TABLE; Schema: public; Owner: wifidog; Tablespace: 
+--
+
+CREATE TABLE networks (
+    network_id text NOT NULL,
+    network_authenticator_class text NOT NULL,
+    network_authenticator_params text,
+    is_default_network boolean DEFAULT false NOT NULL,
+    name text DEFAULT 'Unnamed network'::text NOT NULL,
+    creation_date date DEFAULT now() NOT NULL,
+    homepage_url text,
+    tech_support_email text,
+    validation_grace_time interval DEFAULT '00:20:00'::interval NOT NULL,
+    validation_email_from_address text DEFAULT 'validation@wifidognetwork'::text NOT NULL,
+    allow_multiple_login boolean DEFAULT false NOT NULL,
+    allow_splash_only_nodes boolean DEFAULT false NOT NULL,
+    allow_custom_portal_redirect boolean DEFAULT false NOT NULL,
+    CONSTRAINT networks_name_check CHECK ((name <> ''::text)),
+    CONSTRAINT networks_network_authenticator_class_check CHECK ((network_authenticator_class <> ''::text)),
+    CONSTRAINT networks_validation_email_from_address_check CHECK ((validation_email_from_address <> ''::text))
 );
 
@@ -335 +396 @@
     province text,
     country text,
-    postal_code text
+    postal_code text,
+    network_id text NOT NULL,
+    last_paged timestamp without time zone,
+    is_splash_only_node boolean DEFAULT false,
+    custom_portal_redirect_url text
 );
 
@@ -552 +617 @@
 
 --
+-- Name: network_stakeholders_pkey; Type: CONSTRAINT; Schema: public; Owner: wifidog; Tablespace: 
+--
+
+ALTER TABLE ONLY network_stakeholders
+    ADD CONSTRAINT network_stakeholders_pkey PRIMARY KEY (network_id, user_id);
+
+
+--
+-- Name: networks_pkey; Type: CONSTRAINT; Schema: public; Owner: wifidog; Tablespace: 
+--
+
+ALTER TABLE ONLY networks
+    ADD CONSTRAINT networks_pkey PRIMARY KEY (network_id);
+
+
+--
 -- Name: node_deployment_status_pkey; Type: CONSTRAINT; Schema: public; Owner: wifidog; Tablespace: 
 --
@@ -788 +869 @@
 
 --
+-- Name: $1; Type: FK CONSTRAINT; Schema: public; Owner: wifidog
+--
+
+ALTER TABLE ONLY node_stakeholders
+    ADD CONSTRAINT "$1" FOREIGN KEY (node_id) REFERENCES nodes(node_id);
+
+
+--
 -- Name: $2; Type: FK CONSTRAINT; Schema: public; Owner: wifidog
 --
@@ -852 +941 @@
 
 --
+-- Name: $2; Type: FK CONSTRAINT; Schema: public; Owner: wifidog
+--
+
+ALTER TABLE ONLY node_stakeholders
+    ADD CONSTRAINT "$2" FOREIGN KEY (user_id) REFERENCES users(user_id);
+
+
+--
 -- Name: $3; Type: FK CONSTRAINT; Schema: public; Owner: wifidog
 --
@@ -892 +989 @@
 
 --
+-- Name: account_origin_fkey; Type: FK CONSTRAINT; Schema: public; Owner: wifidog
+--
+
+ALTER TABLE ONLY users
+    ADD CONSTRAINT account_origin_fkey FOREIGN KEY (account_origin) REFERENCES networks(network_id) ON UPDATE CASCADE ON DELETE RESTRICT;
+
+
+--
 -- Name: administrators_ibfk_1; Type: FK CONSTRAINT; Schema: public; Owner: wifidog
 --
@@ -940 +1045 @@
 
 --
--- Name: node_stakeholders_node_id_fkey; Type: FK CONSTRAINT; Schema: public; Owner: wifidog
---
-
-ALTER TABLE ONLY node_stakeholders
-    ADD CONSTRAINT node_stakeholders_node_id_fkey FOREIGN KEY (node_id) REFERENCES nodes(node_id);
-
-
---
--- Name: node_stakeholders_user_id_fkey; Type: FK CONSTRAINT; Schema: public; Owner: wifidog
---
-
-ALTER TABLE ONLY node_stakeholders
-    ADD CONSTRAINT node_stakeholders_user_id_fkey FOREIGN KEY (user_id) REFERENCES users(user_id);
+-- Name: network_id_fkey; Type: FK CONSTRAINT; Schema: public; Owner: wifidog
+--
+
+ALTER TABLE ONLY nodes
+    ADD CONSTRAINT network_id_fkey FOREIGN KEY (network_id) REFERENCES networks(network_id) ON UPDATE CASCADE ON DELETE RESTRICT;
+
+
+--
+-- Name: network_id_fkey; Type: FK CONSTRAINT; Schema: public; Owner: wifidog
+--
+
+ALTER TABLE ONLY network_has_content
+    ADD CONSTRAINT network_id_fkey FOREIGN KEY (network_id) REFERENCES networks(network_id) ON UPDATE CASCADE ON DELETE CASCADE;
+
+
+--
+-- Name: network_stakeholders_network_id_fkey; Type: FK CONSTRAINT; Schema: public; Owner: wifidog
+--
+
+ALTER TABLE ONLY network_stakeholders
+    ADD CONSTRAINT network_stakeholders_network_id_fkey FOREIGN KEY (network_id) REFERENCES networks(network_id);
+
+
+--
+-- Name: network_stakeholders_user_id_fkey; Type: FK CONSTRAINT; Schema: public; Owner: wifidog
+--
+
+ALTER TABLE ONLY network_stakeholders
+    ADD CONSTRAINT network_stakeholders_user_id_fkey FOREIGN KEY (user_id) REFERENCES users(user_id);
 
 

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

@@ -29 +29 @@
 require_once 'AbstractGeocoder.php';
 
-/** Abstract a Node.  A Node is an actual physical transmitter. */
+/** Abstract a Node.  A Node is an actual physical transmitter.
+ * @todo:  Make all the setter functions no-op if the value is the same as what
+ * was already stored Use setCustomPortelReduirectUrl as an example*/
 class Node implements GenericObject
 {
@@ -474 +476 @@
         }
 
+        /** Is the node a Splash Only node?  Will only return true if the Network configuration allows it.
+         * @return true or false */
+        public function isSplashOnly()
+        {
+                return $this->getNetwork()->getSplashOnlyNodesAllowed() && $this->isConfiguredSplashOnly();
+        }
+
+        /** Is the node configured as a Splash Only node?  This is NOT the same as isSplashOnly().  
+         * This is the getter for the configuration set in the database for this node.  
+         * For the node to actually be splash only, this AND the network
+         * gonfiguration must match.
+         * @return true or false */
+        public function isConfiguredSplashOnly()
+        {
+                return (($this->mRow['is_splash_only_node']=='t') ? true : false);
+        }
+
+        /** Set if this node should be a splash-only (no login) node (if enabled in Network configuration)
+         * @param $value The new value, true or false
+         * @return true on success, false on failure */
+        function setIsConfiguredSplashOnly($value)
+        {
+                $retval = true;
+                if ($value != $this->isConfiguredSplashOnly())
+                {
+                        global $db;
+                        $value?$value='TRUE':$value='FALSE';
+                        $retval = $db->ExecSqlUpdate("UPDATE nodes SET is_splash_only_node = {$value} WHERE node_id = '{$this->getId()}'", false);
+                        $this->refresh();
+                }
+                return $retval;
+        }               
+        
+        
+        /** The url to show instead of the portal.  If empty, the portal is shown
+         Must be enabled in the Network configuration to have any effect
+         @return a string */
+        function getCustomPortalRedirectUrl()
+        {
+                return $this->mRow['custom_portal_redirect_url'];
+        }
+        
+        /** The url to show instead of the portal.  If empty, the portal is shown
+         Must be enabled in the Network configuration to have any effect
+         @return true on success, false on failure */
+        function setCustomPortalRedirectUrl($value)
+        {
+                $retval = true;
+                if ($value != $this->getCustomPortalRedirectUrl())
+                {
+                        global $db;
+                        $value = $db->EscapeString($value);
+                        $retval = $db->ExecSqlUpdate("UPDATE nodes SET custom_portal_redirect_url = '{$value}' WHERE node_id = '{$this->getId()}'", false);
+                        $this->refresh();
+                }
+                return $retval;
+        }
+        
         /** Retreives the admin interface of this object.
          * @return The HTML fragment for this interface */
@@ -480 +540 @@
                 //TODO: Most of this code will be moved to Hotspot class when the abtraction will be completed
 
+//pretty_print_r($_REQUEST);
+//pretty_print_r($this->mRow);
                 $html = '';
                 $html .= "<div class='admin_container'>\n";
@@ -629 +691 @@
                 $value = htmlspecialchars($this->getTransitInfo(), ENT_QUOTES);
                 $html .= "<input type='text' size ='50' value='$value' name='$name'>\n";
-                $html .= "</div>\n";
-                $html .= "</div>\n";
-
-                // Deployment status
-                $html .= "<div class='admin_section_container'>\n";
-                $html .= "<div class='admin_section_title'>"._("Node deployment status")." : </div>\n";
-                $html .= "<div class='admin_section_data'>\n";
-                $name = "node_".$hashed_node_id."_deployment_status";
-                $html .= self :: getSelectDeploymentStatus($name);
                 $html .= "</div>\n";
                 $html .= "</div>\n";
@@ -701 +754 @@
                 $html .= "</div>\n";
 
+                // Node configuration section
+                $html .= "<div class='admin_section_container'>\n";
+                $html .= "<div class='admin_section_title'>"._("Node configuration:")."</div>\n";
+                
+                $network = $this->getNetwork();
+                
+                // Deployment status
+                $html .= "<div class='admin_section_container'>\n";
+                $html .= "<div class='admin_section_title'>"._("Node deployment status")." : </div>\n";
+                $html .= "<div class='admin_section_data'>\n";
+                $name = "node_".$hashed_node_id."_deployment_status";
+                $html .= self :: getSelectDeploymentStatus($name);
+                $html .= "</div>\n";
+                $html .= "</div>\n";
+
+                //  is_splash_only_node
+                if($network->getSplashOnlyNodesAllowed())
+                {
+                $html .= "<div class='admin_section_container'>\n";
+                $html .= "<div class='admin_section_title'>"._("Is this node splash-only (no login)?")." : </div>\n";
+                $html .= "<div class='admin_section_data'>\n";
+                $name = "node_".$hashed_node_id."_is_splash_only_node";
+                $this->isConfiguredSplashOnly()? $checked='CHECKED': $checked='';
+                $html .= "<input type='checkbox' name='$name' $checked>\n";
+                $html .= "</div>\n";
+                $html .= "</div>\n";
+                }
+                
+                                // custom_portal_redirect_url
+                if($network->getCustomPortalRedirectAllowed())
+                {
+                        $html .= "<div class='admin_section_container'>\n";
+                $html .= "<div class='admin_section_title'>"._("URL to show instead of the portal (if this is not empty, the portal will be disabled and this URL will be shown instead)")." : </div>\n";
+                $html .= "<div class='admin_section_data'>\n";
+                $name = "node_".$hashed_node_id."_custom_portal_redirect_url";
+                $value = htmlspecialchars($this->getCustomPortalRedirectUrl(), ENT_QUOTES);
+                $html .= "<input type='text' size ='50' value='$value' name='$name'>\n";
+                $html .= "</div>\n";
+                $html .= "</div>\n";
+                }
+                // End Node configuration section
+                $html .= "</div>\n";
+                
                 // Owners management
                 $html .= "<div class='admin_section_container'>\n";
@@ -858 +954 @@
                 $name = "node_".$hashed_node_id."_mass_transit_info";
                 $this->setTransitInfo($_REQUEST[$name]);
-
-                // Deployment status
-                $name = "node_".$hashed_node_id."_deployment_status";
-                $this->setDeploymentStatus(self :: processSelectDeploymentStatus($name));
 
                 // GIS data
@@ -899 +991 @@
                         header("Location: hotspot_log.php?node_id=".urlencode($this->getId()));
 
+                // Node configuration section
+                
+                $network = $this->getNetwork();
+
+                // Deployment status
+                $name = "node_".$hashed_node_id."_deployment_status";
+                $this->setDeploymentStatus(self :: processSelectDeploymentStatus($name));
+
+                //  is_splash_only_node
+                if($network->getSplashOnlyNodesAllowed())
+                {
+                $name = "node_".$hashed_node_id."_is_splash_only_node";
+                $this->setIsConfiguredSplashOnly(empty($_REQUEST[$name])?false:true);   
+                }
+                
+                // custom_portal_redirect_url
+                if($network->getCustomPortalRedirectAllowed())
+                {
+                $name = "node_".$hashed_node_id."_custom_portal_redirect_url";
+                $this->setCustomPortalRedirectUrl($_REQUEST[$name]);
+                }
+                
+                // End Node configuration section
+
                 // Owners processing
                 // Rebuild user id, and delete if it was selected

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

@@ -2 +2 @@
 error_reporting(E_ALL);
 require_once BASEPATH.'config.php';
+
+function undo_magic_quotes()
+{
+        if (get_magic_quotes_gpc())
+        {
+                $_GET = array_map_recursive('stripslashes', $_GET);
+                $_POST = array_map_recursive('stripslashes', $_POST);
+                $_COOKIE = array_map_recursive('stripslashes', $_COOKIE);
+                $_REQUEST = array_map_recursive('stripslashes', $_REQUEST);
+        }
+}
+
+if (!function_exists('array_map_recursive'))
+{
+        function array_map_recursive($function, $data)
+        {
+                foreach ($data as $i => $item)
+                {
+                        $data[$i] = is_array($item) ? array_map_recursive($function, $item) : $function ($item);
+                }
+                return $data;
+        }
+}
+undo_magic_quotes();
+
 require_once BASEPATH.'classes/AbstractDb.php';
 require_once BASEPATH.'classes/Session.php';

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

@@ -28 +28 @@
 require_once BASEPATH.'classes/AbstractDb.php';
 require_once BASEPATH.'classes/Session.php';
-define('REQUIRED_SCHEMA_VERSION', 27);
+define('REQUIRED_SCHEMA_VERSION', 28);
 
 /** Check that the database schema is up to date.  If it isn't, offer to update it. */
@@ -606 +606 @@
 
                 }
-
+                $new_schema_version = 28;
+                if ($schema_version < $new_schema_version)
+                {
+                        echo "<h2>Preparing SQL statements to update schema to version  $new_schema_version</h2>\n";
+                        $sql .= "\n\nUPDATE schema_info SET value='$new_schema_version' WHERE tag='schema_version';\n";
+            $sql .= "ALTER TABLE nodes ADD COLUMN is_splash_only_node boolean;\n";
+            $sql .= "ALTER TABLE nodes ALTER COLUMN is_splash_only_node SET DEFAULT FALSE;\n";
+            $sql .= "ALTER TABLE nodes ADD COLUMN custom_portal_redirect_url text;\n";
+            
+                }
                 $db->ExecSqlUpdate("BEGIN;\n$sql\nCOMMIT;\n", true);
                 //$db->ExecSqlUpdate("BEGIN;\n$sql\nROLLBACK;\n", true);