Changeset 123

Show
Ignore:
Timestamp:
06/27/07 22:05:00 (1 year ago)
Author:
btm
Message:

Add version from etc/pyramid_version to overview website

Fix greedy regex for essid in wireless function

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • Pyramid/dist/var/www/admin/include/functions.php

    r117 r123  
    595595        $data['nick'] = getnext($output,"Nickname"); 
    596596//      $data['essid'] = getnext($output,"ESSID"); 
    597         ereg('ESSID:"(.*)"',$output,$regs); 
     597        ereg('ESSID:"(.*)" .*',$output,$regs); 
    598598        $data['essid'] = $regs[1]; 
    599599        $data['mode'] =  getnext($output,"Mode"); 

  • Pyramid/dist/var/www/admin/index.php

    r1 r123  
    6464} 
    6565else { 
    66   echo "<p class=\"index\"><img src=\"/images/pyramid.png\" width=\"100\"><br /><br /><font color='#900040'>".chostname()."</font> online</p><p class=\"index\">Uptime: ".uptime()."</p><br><br>"; 
     66  echo "<p class=\"index\"><img src=\"/images/pyramid.png\" width=\"100\"><br /><br /><font color='#900040'>".chostname(). 
     67        "</font> online</p><p class=\"index\">Uptime: ".uptime(); 
     68  if($vf = @fopen("/etc/pyramid_version", "r")) { 
     69        $pyramid_version = fgets($vf, 4096); 
     70        echo "<br>Pyramid Version: $pyramid_version"; 
     71  } 
     72  echo "</p><br><br>"; 
    6773} 
    6874