Changeset 554

Timestamp:

04/19/05 17:04:33 (8 years ago)

Author:

benoitg

Message:

2005-04-19 Benoit Gr�goire <bock@…>

• Working (beta...) content manager and portal.
• Add content preview mode

Location:

trunk/wifidog-auth

Files:

• ChangeLog (modified) (1 diff)
• wifidog/admin/generic_object_admin.php (modified) (3 diffs)
• wifidog/classes/Content/HotspotRss.php (added)
• wifidog/classes/Network.php (modified) (1 diff)
• wifidog/classes/Node.php (modified) (7 diffs)
• wifidog/config.php (modified) (2 diffs)
• wifidog/local_content/default/stylesheet.css (modified) (1 diff)
• wifidog/portal/index.php (modified) (3 diffs)

trunk/wifidog-auth/ChangeLog

@@ +1 @@
+2005-04-19 Benoit Grégoire  <bock@step.polymtl.ca>
+        * Working (beta...) content manager and portal.
+        * Add content preview mode
+        
 2005-04-18 Benoit Grégoire  <bock@step.polymtl.ca>
         * Hotspot and network content association, continue access control work.

trunk/wifidog-auth/wifidog/admin/generic_object_admin.php

@@ -23 +23 @@
 /**@file generic_object_admin.php
  * A simple interface to edit any object that implements the GenericObject interface.  The php file takes the following params:
- * $_REQUEST['action']: new, edit, delete (also save, but not meant for calling from outside this file)
+ * $_REQUEST['action']: new, edit, delete, preview (also save, but not meant for calling from outside this file)
  * $_REQUEST['object_id']:  The id of the object ot be edited
  * $_REQUEST['object_class']:  The class name of the object ot be edited
+ * $_REQUEST['node_id']: In preview mode, the current node to simulate display
  * $_REQUEST['debug']:  If present and non empty, the $_REQUEST variables will be displayed
  * @author Copyright (C) 2005 Benoit Grégoire <bock@step.polymtl.ca>,
@@ -106 +107 @@
         $html .= '</form>';
         
+                $html .= "<form action='".GENERIC_OBJECT_ADMIN_ABS_HREF."' method='post'>";
+                $html .= $common_input;
+        $html .= "<input type='hidden' name='action' value='preview'>\n";
+        $html .= "<input type=submit name='preview_submit' value='"._("Preview")." ".get_class($object)."'>\n";
+        $html .= '</form>';
+        
         $html .= "<form action='".GENERIC_OBJECT_ADMIN_ABS_HREF."' method='post'>";
 $html .= $common_input;
@@ -113 +120 @@
 }
 
+
+if ($_REQUEST['action'] == 'preview')
+{
+        if(empty($_REQUEST['node_id']))
+        {
+                $node_id = null;
+                $node = null;
+        }
+        else
+        {
+        $node_id = $_REQUEST['node_id'];
+        $node= Node::getObject($node_id);
+        Node::setCurrentNode($node);
+        }
+$common_input = '';
+        if(!empty($_REQUEST['debug']))
+        {
+        $common_input .= "<input type=submit name='debug' value='true'>\n";
+        }
+                $common_input .= "<input type='hidden' name='object_id' value='".$object->GetId()."'>\n";
+        $common_input .= "<input type='hidden' name='object_class' value='".get_class($object)."'>\n";
+                $common_input .= "<input type='hidden' name='node_id' value='".$node_id."'>\n";
+                
+        $html .= "<form action='".GENERIC_OBJECT_ADMIN_ABS_HREF."' method='post'>";
+$html .= $common_input;
+
+                $name = "node_id";
+                $html .= Node :: getSelectNodeUI($name);
+                
+        $html .= $object->getUserUI();
+        $html .= "<input type='hidden' name='action' value='preview'>\n";
+        $html .= "<input type=submit name='preview_submit' value='"._("Preview")." ".get_class($object)."'>\n";
+        $html .= '</form>';
+        
+        $html .= "<form action='".GENERIC_OBJECT_ADMIN_ABS_HREF."' method='post'>";
+$html .= $common_input;
+        $html .= "<input type='hidden' name='action' value='edit'>\n";
+        $html .= "<input type=submit name='edit_submit' value='"._("Edit")." ".get_class($object)."'>\n";
+        $html .= '</form>';
+}
+
 echo $html;
 $smarty->display("templates/footer.html");

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

@@ -41 +41 @@
         {
                 return new self($id);
+        }
+
+        /** Get the current network for which the portal is displayed or to which a user is physically connected.
+         * @param $real_network_only true or false.  If true, the real physical network where the user is connected is returned, and the node set by setCurrentNode is ignored.
+         * @return a Node object, or null if it can't be found.
+         */
+        static function getCurrentNetwork($real_network_only = false)
+        {
+                                global $AUTH_SOURCE_ARRAY;
+                $keys = array_keys ( $AUTH_SOURCE_ARRAY);
+                
+                return new self($keys[0]);
         }
 

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

@@ -1 +1 @@
 <?php
+
 
 /********************************************************************\
@@ -30 +31 @@
         private $mRow;
         private $id;
+        private static $current_node_id = null;
 
         /** Instantiate a node object 
@@ -42 +44 @@
         }
 
+        /** Get the current node for which the portal is displayed or to which a user is physically connected.
+         * @param $real_node_only true or false.  If true, the real physical node where the user is connected is returned, and the node set by setCurrentNode is ignored.
+         * @return a Node object, or null if it can't be found.
+         */
+        static function getCurrentNode($real_node_only = false)
+        {
+                $object = null;
+                if (self :: $current_node_id != null && $real_node_only == false)
+                {
+                        $object = new self(self :: $current_node_id);
+                }
+                else
+                {
+                        $object = getCurrentRealNode();
+                }
+                return $object;
+        }
+
+        /** Set the current node where the user is to be considered connected to.  (For portal and content display purpuses, among other.
+         * @param $node Node.  The new current node.
+         * @return true  */
+        static function setCurrentNode(Node $node)
+        {
+                self :: $current_node_id = $node->GetId();
+                return true;
+        }
+
+        /** Get the current node to which a user is physically connected, if any.  This is done by an IP adress lookup against the last reported IP adress of the node
+         * @param        * @return a Node object, or null if it can't be found.
+         */
+        public function getCurrentRealNode()
+        {
+                global $db;
+                $retval = null;
+                $sql = "SELECT node_id, last_heartbeat_ip from nodes WHERE last_heartbeat_ip='$_SERVER[REMOTE_ADDR]'";
+                $db->ExecSql($sql, $node_rows, false);
+                $num_match = count($node_rows);
+                if ($num_match == 0)
+                {
+                        // User is not physically connected to a node
+                        $retval = null;
+                }
+                else
+                        if ($num_match = 1)
+                        {
+                                // Only a single node matches, the user is presumed to be there
+                                $retval = new self($node_rows[0]['node_id']);
+                        }
+                        else
+                        {
+                                /* We have more than one node matching the IP (the nodes are behind the same NAT).
+                                 * We will try to discriminate by finding which node the user last authenticated against.
+                                 * If the IP matches, we can be pretty certain the user is there. 
+                                 */
+                                $retval = null;
+                                $current_user = User :: getCurrentUser();
+                                if ($current_user != null)
+                                {
+                                        $current_user_id = $current_user->getId();
+                                        $_SERVER['REMOTE_ADDR'];
+                                        $sql = "SELECT node_id, last_heartbeat_ip from connections NATURAL JOIN nodes WHERE user_id='$current_user_id' ORDER BY last_updated DESC ";
+                                        $db->ExecSql($sql, $node_rows, false);
+                                        $node_row = $node_rows[0];
+                                        if($node_row!=null && $node_row['last_heartbeat_ip']==$_SERVER['REMOTE_ADDR'])
+                                        {
+                                                $retval = new self($node_row['node_id']);
+                                        }
+                                }
+                        }
+return $retval;
+        }
+
         public function delete(& $errmsg)
         {
-                $retval=false;
-                $user = User::getCurrentUser();
-                if($this->isOwner($user)||$user->isSuperAdmin())
-                {
-                        $errmsg=_('Access denied!');
+                $retval = false;
+                $user = User :: getCurrentUser();
+                if ($this->isOwner($user) || $user->isSuperAdmin())
+                {
+                        $errmsg = _('Access denied!');
                 }
                 global $db;
@@ -54 +128 @@
                 if (!$db->ExecSqlUpdate("DELETE FROM nodes WHERE node_id='{$this->$id}'", false))
                 {
-                        $errmsg=_('Could not delete node!');}
-                        else
-                        {
-                                $retval=true;
-                        }
-return $retval;
+                        $errmsg = _('Could not delete node!');
+                }
+                else
+                {
+                        $retval = true;
+                }
+                return $retval;
         }
 
@@ -123 +198 @@
         * @return html markup
         */
-        public static function getSelectNodeUI($user_prefix, $sql_additional_where=null)
+        public static function getSelectNodeUI($user_prefix, $sql_additional_where = null)
         {
                 global $db;
@@ -290 +365 @@
                 return $html;
         }
-        
+
         /** Process admin interface of this object.
         */
         public function processAdminUI()
         {
-                if($this->isOwner($user)||$user->isSuperAdmin())
+                $user = User::getCurrentUser();
+                if (!$this->isOwner($user) || !$user->isSuperAdmin())
                 {
                         throw new Exception(_('Access denied!'));
@@ -317 +393 @@
                 }
         }
-        
-/** Add content to this node */
+
+        /** Add content to this node */
         public function addContent(Content $content)
         {
                 global $db;
-                $content_id=$db->EscapeString($content->getId());
+                $content_id = $db->EscapeString($content->getId());
                 $sql = "INSERT INTO node_has_content (node_id, content_id) VALUES ('$this->id','$content_id')";
                 $db->ExecSqlUpdate($sql, false);
         }
-        
-/** Remove content from this node */
+
+        /** Remove content from this node */
         public function removeContent(Content $content)
         {
                 global $db;
-                $content_id=$db->EscapeString($content->getId());
+                $content_id = $db->EscapeString($content->getId());
                 $sql = "DELETE FROM node_has_content WHERE node_id='$this->id' AND content_id='$content_id'";
                 $db->ExecSqlUpdate($sql, false);
         }
-        
+
         /**Get an array of all Content linked to this node
         * @return an array of Content or an empty arrray */

trunk/wifidog-auth/wifidog/config.php

@@ -7 +7 @@
  *
  *     $Log$
+ *     Revision 1.32  2005/04/19 21:02:40  benoitg
+ *     2005-04-19 Benoit Gr�goire  <bock@step.polymtl.ca>
+ *      * Working (beta...) content manager and portal.
+ *      * Add content preview mode
+ *
  *     Revision 1.31  2005/04/14 15:12:35  benoitg
  *     2005-04-14 Benoit Gr�goire  <bock@step.polymtl.ca>
@@ -214 +219 @@
 define('STYLESHEET_NAME', 'stylesheet.css');
 define('LOGIN_PAGE_NAME', 'login.html');
-define('PORTAL_PAGE_NAME', 'portal.html');
+define('PORTAL_PAGE_NAME', 'portal.html');/**< @deprecated version - 19-Apr-2005*/
 define('PAGE_HEADER_NAME', 'header.html');
 define('PAGE_FOOTER_NAME', 'footer.html');

trunk/wifidog-auth/wifidog/local_content/default/stylesheet.css

@@ -209 +209 @@
 
 .list_ui_container{ display: inline; }
+
+/* Portal */
+
+#portal_container {
+margin: 3px;}
+
+.portal_network_section {/*background-color:    #FBFBFF;/*lighter blue*/
+margin: 3px;}
+.portal_node_section {/*background-color:       #FBFBFF;/*lighter blue*/
+margin: 3px;}
+.portal_user_section {/*background-color:       #FBFBFF;/*lighter blue*/
+margin: 3px;}
+
+.portal_section_logo{
+float: right;
+clear: right;
+ padding: 2px;
+max-height: 100px;
+max-width: 100px;
+}
+
 {/literal}

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

@@ -32 +32 @@
     garbage_collect();
 }
+$node = Node::getObject($_REQUEST['gw_id']);
 
-if (!isset($_REQUEST['gw_id'])) {
+if ($node==null) {
     $smarty->display("templates/message_unknown_hotspot.html");
     exit;
 }
+$node_id=$node->getId();
+$portal_template = $node_id . ".html";
 
-$portal_template = $_REQUEST['gw_id'] . ".html";
-$node_id = $db->EscapeString($_REQUEST['gw_id']);
-
-$node = Node::getObject($node_id);
 if ($node == null) {
     $smarty->assign("gw_id", $_REQUEST['gw_id']);
@@ -48 +47 @@
 }
 
+Node::setCurrentNode($node);
+
 $smarty->assign('hotspot_name', $node->getName());
-$hotspot_rss_url = $node->getRSSURL();
+$node_name= $node->getName();
 
 /* Find out who is online */
 $smarty->assign("online_users", $node->getOnlineUsers());
 
-if (RSS_SUPPORT) {
-    //      $old_error_level = error_reporting(E_ERROR);
-    define('MAGPIE_DIR', BASEPATH.MAGPIE_REL_PATH);
-    //    require_once(MAGPIE_DIR.'rss_fetch.inc');
-    //    define('MAGPIE_DEBUG', 0);
-    require_once BASEPATH.'classes/RssPressReview.inc';
-    $press_review=new RssPressReview;
-    $tokens = "/[\s,]+/";
-    $network_rss_sources = NETWORK_RSS_URL;
-    $network_rss_html = null;
-    if(!empty($network_rss_sources))
-      {
-
-        $extract_array=null;
-        $extract_array = preg_split($tokens, $network_rss_sources);
-        //print_r($extract_array);
-        foreach($extract_array as $source)
-          {
-            $network_rss_sources_array[] = array('url' => $source, 'default_publication_interval' => 7*24*3600);
-          }
-        $network_rss_html=$press_review->get_rss_html($network_rss_sources_array, 5);
-      }
-                     
-    $hotspot_rss_html=null;
-    if(!empty($hotspot_rss_url))
-      {
-        $extract_array=null;
-        $extract_array = preg_split($tokens, $hotspot_rss_url);
-        //print_r($extract_array);
-        foreach($extract_array as $source)
-          {
-            $hotspot_rss_sources_array[] = array('url' => $source, 'default_publication_interval' => 7*24*3600);
-          }
-        $hotspot_rss_html=$press_review->get_rss_html($hotspot_rss_sources_array, 5);     
-      }
-    /**
-     @return the generated html or the error message or an empty string if called without a URL.
-    */
-    function generate_rss_html ( $url ) {
-      $rss_html='';
-      if(!empty($url))
-        {
-          $rss = fetch_rss( $url );
-          $rss_html='';
-          if ( !$rss )
-            {
-              $rss_html .= _("Error: ") . magpie_error() ;
-            }
-          else 
-            {
-              //$rss->show_channel();
-              //$rss->show_list();
-              $rss_html .= "<p>"._('Channel: ') . $rss->channel['title'] . "</p>\n";
-              $rss_html .= "<ul>\n";
-              foreach ($rss->items as $item)
-                {
-                  //echo '<pre>'; print_r($item);       echo '</pre>';
-                  $href = $item['link'];
-                  $title = $item['title'];
-                  $summary =  $item['summary']; 
-                  $rss_html .= "<li><emp><a href=$href>$title</a></emp> $summary</li>\n";
-                }
-              $rss_html .= "</ul>\n";
-            }
-        }
-      return $rss_html;
-    }
-
-
-    //$network_rss_html=generate_rss_html(NETWORK_RSS_URL);    
-    //echo $networkrss_html;
-    $smarty->assign("network_rss_html", $network_rss_html);
-
-    
-    //$hotspot_rss_html=generate_rss_html($hotspot_rss_url);    
-    //echo $hotspot_rss_html;
-    $smarty->assign("hotspot_rss_html", $hotspot_rss_html);
-    //   error_reporting($old_error_level);
-}
 
 if (isset($session)) {
     $smarty->assign("original_url_requested", $session->get(SESS_ORIGINAL_URL_VAR));
 }
+        $hotspot_network_name=HOTSPOT_NETWORK_NAME;
+        $hotspot_network_url=HOTSPOT_NETWORK_URL;
+        $network_logo_url=COMMON_CONTENT_URL.NETWORK_LOGO_NAME;
+        $network_logo_banner_url=COMMON_CONTENT_URL.NETWORK_LOGO_BANNER_NAME;
+
+     $hotspot_logo_url= find_local_content_url(HOTSPOT_LOGO_NAME);
+     $hotspot_logo_banner_url=find_local_content_url(HOTSPOT_LOGO_BANNER_NAME);
+
 
 $smarty->display(DEFAULT_CONTENT_SMARTY_PATH."header.html");
+$html='';
+$html .= "<div id='portal_container'>\n";
 
+/* Network section */
+$html .= "<div class='portal_network_section'>\n";
+$html .= "<a href='{$hotspot_network_url}'><img class='portal_section_logo' src='{$network_logo_banner_url}' alt='{$hotspot_network_name} logo' border='0'></a>\n";
+$html .= "Content from \"<a href='{$hotspot_network_url}'>{$hotspot_network_name}</a>\"\n";
+$contents = Network::getCurrentNetwork()->getAllContent();
+foreach ($contents as $content)
+{
+        $html .= $content->getUserUI();
+}
+$html .= "</div>\n";
+
+/* Node section */
+$html .= "<div class='portal_node_section'>\n";
+$html .= "<img class='portal_section_logo' src='{$hotspot_logo_url}' alt=''>\n";
+$html .= "Content from \"<a href='{$hotspot_logo_url}'>{$node_name}</a>\"\n";
+$contents = $node->getAllContent();
+foreach ($contents as $content)
+{
+        $html .= $content->getUserUI();
+}
+$html .= "</div>\n";
+
+/* User section */
+$html .= "<div class='portal_user_section'>\n";
+$html .= _("My content")."\n";
+$html .= "</div>\n";
+$html .= "</div>\n"; /* end portal_container */
+                echo $html;
 /* If we have local content, display it. Otherwise, display default */
-if (is_file(NODE_CONTENT_PHP_RELATIVE_PATH.PORTAL_PAGE_NAME)) {
+/*if (is_file(NODE_CONTENT_PHP_RELATIVE_PATH.PORTAL_PAGE_NAME)) {
     $smarty->assign("local_content_path", NODE_CONTENT_SMARTY_PATH);
     $smarty->display(NODE_CONTENT_SMARTY_PATH.PORTAL_PAGE_NAME);
@@ -148 +108 @@
     $smarty->display(DEFAULT_CONTENT_SMARTY_PATH.PORTAL_PAGE_NAME);
 }
+*/
 
 $smarty->display(DEFAULT_CONTENT_SMARTY_PATH."footer.html");