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

Timestamp:

09/10/05 20:05:18 (8 years ago)

Author:

benoitg

Message:

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

• Add UI to add a new Network
• Improve UI to add a new Node and new Content

Files:

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

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

@@ -1 +1 @@
 <?php
+
+
 /********************************************************************\
  * This program is free software; you can redistribute it and/or    *
@@ -128 +130 @@
                 $user = User :: getCurrentUser();
                 if ($this->isOwner($user) || $user->isSuperAdmin())
-                {
-                        $errmsg = _('Access denied!');
-                }
-
+{
                 global $db;
                 $id = $db->EscapeString($this->getId());
@@ -142 +141 @@
                         $retval = true;
                 }
+}
+else
+                {
+                        $errmsg = _('Access denied!');
+                }
 
                 return $retval;
         }
 
-        /** Create a new Node in the database
-         * @param $id The id to be given to the new node
+        /** Create a new Node in the database 
+         * @param $node_id The id to be given to the new node.  If not present, a
+         * guid will be assigned.
+         * @param $network Network object.  The node's network.  If not present,
+         * the current Network will be assigned
+         * 
          * @return the newly created Node object, or null if there was an error
          */
-        static function createNewObject()
-        {
-                global $db;
-
-                $node_id = $db->EscapeString(get_guid());
-                $object = self::createNewNode($node_id, Network::getCurrentNetwork());
-                return $object;
-        }
-
-        /** Create a new Node in the database 
-         * @param $node_id The id to be given to the new node
-         * @param $network Network object.  The node's network 
-         * @todo Implement network 
-         * @return the newly created Node object, or null if there was an error
-         */
-        static function createNewNode($node_id, Network $network)
-        {
-                global $db;
+        static function createNewObject($node_id = null, $network = null)
+        {
+                global $db;
+                if(empty($node_id))
+                {
+                        $node_id = get_guid();
+                }
                 $node_id = $db->EscapeString($node_id);
+                
+                if(empty($network))
+                {
+                        $network = Network :: getCurrentNetwork();
+                }
+                $network_id = $db->EscapeString($network->getId());
+                
                 $node_deployment_status = $db->EscapeString("IN_PLANNING");
                 $node_name = _("New node");
@@ -174 +178 @@
                         throw new Exception(_('This node already exists.'));
 
-                $sql = "INSERT INTO nodes (node_id, creation_date, node_deployment_status, name) VALUES ('$node_id', NOW(),'$node_deployment_status', '$node_name')";
+                $sql = "INSERT INTO nodes (node_id, network_id, creation_date, node_deployment_status, name) VALUES ('$node_id', '$network_id', NOW(),'$node_deployment_status', '$node_name')";
 
                 if (!$db->ExecSqlUpdate($sql, false))
@@ -222 +226 @@
         }
 
+        /** Get an interface to create a new node.
+        * @param $network Optional:  The network to which the new node will belong,
+        * if absent, the user will be prompted.
+        * @return html markup
+        */
+        public static function getCreateNewObjectUI($network = null)
+        {
+                $html = '';
+                $html .= _("Create new node with id")." \n";
+                $name = "new_node_id";
+                $html .= "<input type='text' size='10' name='{$name}'>\n";
+                if ($network)
+                {
+                        $name = "new_node_network_id";
+                        $html .= "<input type='hidden' name='{$name}' value='{$network->getId()}'>\n";
+                }
+                else
+                {
+                        $html .= " "._("in network:")." \n";
+                        $html .= Network :: getSelectNetworkUI('new_node');
+                }
+                return $html;
+
+        }
+
+        /** Process the new object interface. 
+         *  Will return the new object if the user has the credentials and the form was fully filled.
+         * @return the node object or null if no new node was created.
+         */
+        static function processCreateNewObjectUI()
+        {
+                $retval = null;
+                $name = "new_node_id";
+                if (!empty ($_REQUEST[$name]))
+                {
+                        $node_id = $_REQUEST[$name];
+                        $name = "new_node_network_id";
+                        if (!empty ($_REQUEST[$name]))
+                        {
+                                $network = Network :: getObject($_REQUEST[$name]);
+                        }
+                        else
+                        {
+                                $network = Network :: processSelectNetworkUI('new_node');
+                        }
+                        if ($node_id && $network)
+                        {
+                                if (!$network->hasAdminAccess(User :: getCurrentUser()))
+                                {
+                                        throw new Exception(_("Access denied"));
+                                }
+                                $retval = self :: createNewObject($node_id, $network);
+                        }
+                }
+                return $retval;
+        }
+
         /** Get an interface to select the deployment status
         * @param $user_prefix A identifier provided by the programmer to recognise it's generated html form
@@ -258 +319 @@
                 global $db;
                 $this->mDb = & $db;
-                
+
                 $node_id_str = $db->EscapeString($node_id);
                 $sql = "SELECT * FROM nodes WHERE node_id='$node_id_str'";
@@ -280 +341 @@
         public function getNetwork()
         {
-                        return Network::getObject($this->mRow['network_id']);
+                return Network :: getObject($this->mRow['network_id']);
         }
 
@@ -320 +381 @@
         }
 
-    function getCreationDate()
-    {
-        return $this->mRow['creation_date'];
-    }
+        function getCreationDate()
+        {
+                return $this->mRow['creation_date'];
+        }
 
         function getHomePageURL()
@@ -527 +588 @@
         public function isConfiguredSplashOnly()
         {
-                return (($this->mRow['is_splash_only_node']=='t') ? true : false);
+                return (($this->mRow['is_splash_only_node'] == 't') ? true : false);
         }
 
@@ -539 +600 @@
                 {
                         global $db;
-                        $value?$value='TRUE':$value='FALSE';
+                        $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
@@ -554 +614 @@
                 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
@@ -570 +630 @@
                 return $retval;
         }
-        
+
         /** Retrieves the admin interface of this object.
          * @return The HTML fragment for this interface */
@@ -577 +637 @@
                 //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);
+                //pretty_print_r($_REQUEST);
+                //pretty_print_r($this->mRow);
                 $html = '';
                 $html .= "<div class='admin_container'>\n";
@@ -600 +660 @@
                 // Hashed node_id (this is a workaround since PHP auto-converts HTTP vars var periods, spaces or underscores )
                 $hashed_node_id = md5($this->getId());
-                
+
                 // Name
                 $html .= "<div class='admin_section_container'>\n";
@@ -794 +854 @@
                 $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";
@@ -807 +867 @@
 
                 //  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())
+                if ($network->getSplashOnlyNodesAllowed())
                 {
                         $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";
+                        $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";
@@ -936 +996 @@
 
                 // Information about the node
-                
+
                 // Hashed node_id (this is a workaround since PHP auto-converts HTTP vars var periods, spaces or underscores )
                 $hashed_node_id = md5($this->getId());
-                
+
                 // Name
                 $name = "node_".$hashed_node_id."_name";
@@ -1029 +1089 @@
 
                 // Node configuration section
-                
+
                 $network = $this->getNetwork();
 
@@ -1037 +1097 @@
 
                 //  is_splash_only_node
-                if($network->getSplashOnlyNodesAllowed())
-                {
-                $name = "node_".$hashed_node_id."_is_splash_only_node";
-                $this->setIsConfiguredSplashOnly(empty($_REQUEST[$name])?false:true);   
-                }
-                
+                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]);
-                }
-                
+                if ($network->getCustomPortalRedirectAllowed())
+                {
+                        $name = "node_".$hashed_node_id."_custom_portal_redirect_url";
+                        $this->setCustomPortalRedirectUrl($_REQUEST[$name]);
+                }
+
                 // End Node configuration section
 
@@ -1065 +1125 @@
                         }
                 }
-                
+
                 $name = "node_{$this->getId()}_new_owner_submit";
                 if (!empty ($_REQUEST[$name]))
@@ -1405 +1465 @@
                 $sql = "SELECT * FROM nodes WHERE node_id='{$id_str}'";
                 $db->ExecSqlUniqueRes($sql, $row, false);
-                if($row!=null)
+                if ($row != null)
                 {
                         $retval = true;
@@ -1430 +1490 @@
 } // End class
 ?>
+
+