Changeset 1061

Show
Ignore:
Timestamp:
05/22/06 09:01:47 (7 years ago)
Author:
fproulx
Message:

2006-05-22 François Proulx <francois.proulx@…>

  • Removed unnecessary debug message
  • Fixed getNumOnlineUsers to count users by MAC on splash only nodes
Location:
trunk/wifidog-auth
Files:
4 modified

Legend:

Unmodified
Added
Removed

  • trunk/wifidog-auth/CHANGELOG

    r1058 r1061  
     12006-05-22 François Proulx <francois.proulx@gmail.com> 
     2        * Removed unnecessary debug message 
     3        * Fixed getNumOnlineUsers to count users by MAC on splash only nodes 
     4 
    152006-05-22 François Proulx <francois.proulx@gmail.com> 
    26        * Added generateFromArray parameter (max_length) 

  • trunk/wifidog-auth/wifidog/classes/Content/ContentGroup/ContentGroupElement.php

    r1031 r1061  
    532532        if ($this->isPersistent() == false && !empty ($this->content_group_element_row['displayed_content_id'])) { 
    533533            $displayed_content = self::getObject($this->content_group_element_row['displayed_content_id']); 
    534             print_r($displayed_content); 
    535534        } 
    536535    } 

  • trunk/wifidog-auth/wifidog/classes/Content/Langstring/Langstring.php

    r1031 r1061  
    398398 
    399399        $html .= "</div>\n"; 
     400 
    400401        $html .= "<div class='admin_section_tools'>\n"; 
    401  
    402402        $new_substring_submit_name = "langstrings_".$this->id."_add_new_entry"; 
    403  
    404403        $html .= "<input type='submit' class='submit' name='$new_substring_submit_name' value='"._("Add new string")."'>"; 
    405404        $html .= "</div>\n"; 

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

    r1056 r1061  
    13221322                $retval = array (); 
    13231323                $row = null; 
    1324                 $db->execSqlUniqueRes("SELECT COUNT(DISTINCT users.user_id) as count FROM users,connections WHERE connections.token_status='".TOKEN_INUSE."' AND users.user_id=connections.user_id AND connections.node_id='{$this->id}'", $row, false); 
     1324                if(!$this->isConfiguredSplashOnly()) 
     1325                        $db->execSqlUniqueRes("SELECT COUNT(DISTINCT users.user_id) as count FROM users,connections WHERE connections.token_status='".TOKEN_INUSE."' AND users.user_id=connections.user_id AND connections.node_id='{$this->id}'", $row, false); 
     1326                else 
     1327                        $db->execSqlUniqueRes("SELECT COUNT(DISTINCT connections.user_mac) as count FROM connections WHERE connections.token_status='".TOKEN_INUSE."' AND connections.node_id='{$this->id}'", $row, false); 
    13251328                return $row['count']; 
    13261329        }