Changeset 1399

Show
Ignore:
Timestamp:
06/30/09 18:00:14 (3 years ago)
Author:
benoitg
Message:

Try to re-fix #583, that aparently also had a diffrernt cause (for loop hiding a variable)

Location:
trunk/wifidog-auth
Files:
2 modified

Legend:

Unmodified
Added
Removed

  • trunk/wifidog-auth/CHANGELOG

    r1396 r1399  
    11# $Id$ 
     22009-06-26 Benoit Grégoire <benoitg@coeus.ca> 
     3        * Updated greek translation by bill@e-texnologia.gr and strzol@gmail.com, still needs some work. 
     4         
    252009-06-25 Benoit Grégoire <benoitg@coeus.ca> 
    36        * Fix #559 

  • trunk/wifidog-auth/wifidog/signup.php

    r1395 r1399  
    322322$default_network = Network::getDefaultNetwork(); 
    323323 
    324  
    325 foreach ($network_array as $network) { 
    326     if ($network->getAuthenticator()->isRegistrationPermitted()) { 
    327         $sources[$network->getId()] = $network->getName(); 
    328     } 
    329      if ($network->getName() == $default_network) 
    330         $default_network_param = $network->getId(); 
    331         //$default_network_param = $network->getAuthenticatorConstructorParams(); 
    332  
     324foreach ($network_array as $networkObject) { 
     325    if ($networkObject->getAuthenticator()->isRegistrationPermitted()) { 
     326        $sources[$networkObject->getId()] = $networkObject->getName(); 
     327    } 
    333328} 
    334329 
    … …  
    343338 
    344339if (Server::getServer()->getUseGlobalUserAccounts()) 
    345         $smarty->assign('SelectNetworkUI', "<input type=\"hidden\" name=\"auth_source\" value='$default_network_param' />"); 
     340        $smarty->assign('SelectNetworkUI', "<input type=\"hidden\" name=\"auth_source\" value='".$default_network->getId()."' />"); 
    346341else 
    347342        $smarty->assign('SelectNetworkUI', Network::getSelectUI('auth_source', array('preSelectedObject' => $network)) );