Changeset 609

Timestamp:

05/01/05 21:22:02 (8 years ago)

Author:

fproulx

Message:

2005-04-30 Francois Proulx <francois.proulx@…>

• Logout button will now destroy session AND render token USED

Location:

trunk/wifidog-auth

Files:

• ChangeLog (modified) (1 diff)
• wifidog/admin/content_admin.php (modified) (1 diff)
• wifidog/admin/owner_sendfiles.php (modified) (1 diff)
• wifidog/classes/Authenticator.php (modified) (1 diff)
• wifidog/classes/MainUI.php (modified) (3 diffs)
• wifidog/classes/User.php (modified) (3 diffs)
• wifidog/config.php (modified) (2 diffs)
• wifidog/local_content/default/stylesheet.css (modified) (2 diffs)

trunk/wifidog-auth/ChangeLog

@@ +1 @@
+2005-04-30 Francois Proulx <francois.proulx@gmail.com>
+        * Logout button will now destroy session AND render token USED
+        
 2005-04-30 Francois Proulx <francois.proulx@gmail.com>
         * Fixed bug that could potentially let non owners add content in /content through content groups

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

@@ -46 +46 @@
 if ($_REQUEST['action'] == 'list_all_content' || $_REQUEST['action'] == 'list_persistent_content')
 {
-    $html .= '<form action="'.CONTENT_ADMIN_ABS_HREF.'" method="get">';
-    
-    if($_REQUEST['action'] == 'list_persistent_content')
-    {
-        $sql = "SELECT * FROM content WHERE is_persistent = true ORDER BY content_type";
-        $html .= "<input type='hidden' name='action' value='list_all_content'>\n";
-        $html .= "<input type=submit name='list_submit' value='"._("Show all content")."'>\n";
-    }
-    else
-    {
-        $sql = "SELECT * FROM content ORDER BY content_type";
-        $html .= "<input type='hidden' name='action' value='list_persistent_content'>\n";
-        $html .= "<input type=submit name='list_submit' value='"._("Show only persistent content")."'>\n";
-    }   
+        $html .= '<form action="'.CONTENT_ADMIN_ABS_HREF.'" method="get">';
+
+        if ($_REQUEST['action'] == 'list_persistent_content')
+        {
+                $sql = "SELECT * FROM content WHERE is_persistent = true ORDER BY content_type";
+                $html .= "<input type='hidden' name='action' value='list_all_content'>\n";
+                $html .= "<input type=submit name='list_submit' value='"._("Show all content")."'>\n";
+        }
+        else
+        {
+                $sql = "SELECT * FROM content ORDER BY content_type";
+                $html .= "<input type='hidden' name='action' value='list_persistent_content'>\n";
+                $html .= "<input type=submit name='list_submit' value='"._("Show only persistent content")."'>\n";
+        }
         $db->ExecSql($sql, $results, false);
-    
-    $html .= '</form>';
-    
+
+        $html .= '</form>';
+
         if ($results != null)
         {
                 $html .= "<table>\n";
                 $html .= "<tr><th>"._("Title")."</th><th>"._("Content type")."</th><th>"._("Description")."</th></tr>\n";
-        
-        // Get the current user
-        $user = User :: getCurrentUser();
-        
-                foreach ($results as $row)
+
+                // Get the current user
+                $user = User :: getCurrentUser();
+
+                if ($user)
                 {
-                        $content = Content :: getObject($row['content_id']);
-            if ($user->isSuperAdmin() || $content->isOwner(User :: getCurrentUser()))
-            {
-                        if (!empty ($row['title']))
-                        {
-                                $title = Content :: getObject($row['title']);
-                                $title_ui = $title->__toString();
-                        }
-                        else
-                        {
-                                $title_ui = null;
-                        }
-    
-                        if (!empty ($row['description']))
-                        {
-                                $description = Content :: getObject($row['description']);
-                                $description_ui = $description->__toString();
-                        }
-                        else
-                        {
-                                $description_ui = null;
-                        }
-                        $href = GENERIC_OBJECT_ADMIN_ABS_HREF."?object_id=$row[content_id]&object_class=Content&action=edit";
-                        $html .= "<tr><td>$title_ui</td><td><a href='$href'>$row[content_type]</a></td><td>$description_ui</td>\n";
-                        $href = GENERIC_OBJECT_ADMIN_ABS_HREF."?object_id=$row[content_id]&object_class=Content&action=delete";
-                        $html .= "<td><a href='$href'>Delete</a></td>";
-    
-                        $html .= "</tr>\n";
-            }
+                        foreach ($results as $row)
+                        {
+                                $content = Content :: getObject($row['content_id']);
+                                if ($user->isSuperAdmin() || $content->isOwner(User :: getCurrentUser()))
+                                {
+                                        if (!empty ($row['title']))
+                                        {
+                                                $title = Content :: getObject($row['title']);
+                                                $title_ui = $title->__toString();
+                                        }
+                                        else
+                                        {
+                                                $title_ui = null;
+                                        }
+
+                                        if (!empty ($row['description']))
+                                        {
+                                                $description = Content :: getObject($row['description']);
+                                                $description_ui = $description->__toString();
+                                        }
+                                        else
+                                        {
+                                                $description_ui = null;
+                                        }
+                                        $href = GENERIC_OBJECT_ADMIN_ABS_HREF."?object_id=$row[content_id]&object_class=Content&action=edit";
+                                        $html .= "<tr><td>$title_ui</td><td><a href='$href'>$row[content_type]</a></td><td>$description_ui</td>\n";
+                                        $href = GENERIC_OBJECT_ADMIN_ABS_HREF."?object_id=$row[content_id]&object_class=Content&action=delete";
+                                        $html .= "<td><a href='$href'>Delete</a></td>";
+
+                                        $html .= "</tr>\n";
+                                }
+                        }
                 }
                 $html .= "</table>\n";

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

@@ -23 +23 @@
    * @author Copyright (C) 2005 Pascal Leclerc
    */
+//TODO: Move to Node getAdminUI
 
-/*
-  Notes/TODO :
-    Valider les donnees passees en arguments
-    Utiliser smarty
-    Permettre la recherche de user directement dans l'interface owner
-    156.486 / 5120.0 MB Used
-        
-*/
 
 define('BASEPATH','../');

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

@@ -82 +82 @@
                 // Stop traffic counters update
                 global $db;
-                $db->ExecSqlUpdate("UPDATE connections SET "."timestamp_out=NOW(),"."token_status='".TOKEN_USED."' "."WHERE conn_id='{$info['conn_id']}';\n");
+                $db->ExecSqlUpdate("UPDATE connections SET "."timestamp_out=NOW(),"."token_status='".TOKEN_USED."' "."WHERE conn_id='{$info['conn_id']}';\n", false);
         }
         

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

@@ -57 +57 @@
                         $html .= "<ul class='admin_menu_list'>\n";
             
-            if($current_user->isSuperAdmin())
+            if($current_user && $current_user->isSuperAdmin())
             {
                         $html .= "<li><a href='user_log.php'>"._("User logs")."</a></li>\n";
@@ -69 +69 @@
 
                         // If the user is super admin OR owner of at least one hotspot show the menu
-                        if($current_user->isSuperAdmin() || $current_user->isOwner())
+                        if($current_user && ($current_user->isSuperAdmin() || $current_user->isOwner()))
                         {
                                 /* Node admin */
@@ -97 +97 @@
 
                         /* Network admin */
-            if($current_user->isSuperAdmin())
+            if($current_user && $current_user->isSuperAdmin())
             {
                         $html .= "<div class='admin_section_container'>\n";

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

@@ -54 +54 @@
                 try
                 {
-                        $user = new User($session->get(SESS_USER_ID_VAR));
+                        $user = self :: getObject($session->get(SESS_USER_ID_VAR));
+                        //$user = new User($session->get(SESS_USER_ID_VAR));
                 }
                 catch (Exception $e)
@@ -374 +375 @@
 
         }
-        
+
         function getValidationToken()
         {
@@ -460 +461 @@
                 global $session;
                 $session->destroy();
-                //TODO: Completed this part with Network::getObject()
-                /*
-                try {
-                    $connections = $this->getConnections();
-                    foreach($connections as $connection)
-                        if($connection['token_status'] == TOKEN_UNUSED || $connection['token_status'] == TOKEN_INUSE)
-                            Network::getCurrentNetwork()->getAuthenticator()->logout(array('conn_id' => $connection['conn_id']), $errmsg);
-                } catch(Exception $e)
-                {
-                    //TODO: Error management ( MainUI )
-                }*/
+                try
+                {
+                        $connections = $this->getConnections();
+                        if ($connections)
+                                foreach ($connections as $connection)
+                                        if ($connection['token_status'] == TOKEN_UNUSED || $connection['token_status'] == TOKEN_INUSE)
+                                                Network :: getCurrentNetwork()->getAuthenticator()->logout(array ('conn_id' => $connection['conn_id']), $errmsg);
+                }
+                catch (Exception $e)
+                {
+                }
         }
 

trunk/wifidog-auth/wifidog/config.php

@@ -7 +7 @@
  *
  *     $Log$
+ *     Revision 1.42  2005/05/02 01:22:02  fproulx
+ *     2005-04-30 Francois Proulx <francois.proulx@gmail.com>
+ *      * Logout button will now destroy session AND render token USED
+ *
  *     Revision 1.41  2005/04/28 03:14:48  fproulx
  *     *** empty log message ***
@@ -45 +49 @@
  *      * Fixed bugs in File
  *      * Wrote part of EmbeddedContent ( partially working )
- *      * TODO: add support for parameters and attributes in EmbeddedContent
+ *      * add support for parameters and attributes in EmbeddedContent
  *
  *     Revision 1.34  2005/04/21 14:58:29  fproulx

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

@@ -325 +325 @@
 .flickr_title {
         color: white;
-    visibility: hidden;
     width: 200px;
     background: #696969;
@@ -371 +370 @@
 }
 .flickr_description {
-    visibility: hidden;
     width: 180px;
     background: #696969;